diff options
| author | julie lala <jules@okfoc.us> | 2015-05-17 08:07:06 -0400 |
|---|---|---|
| committer | julie lala <jules@okfoc.us> | 2015-05-17 08:07:06 -0400 |
| commit | 45197dbb5a49c75509d95fae072f828bdbc7e13e (patch) | |
| tree | b9e177b49203d6e73b3c9e15f8ce59b8b32b50c8 /site/templates | |
| parent | 7f84dfb770ac2f9bae282ef00d9a93f21255fa45 (diff) | |
| parent | a0d2729e311f53ecaa014c097c1a485581853100 (diff) | |
Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers
Diffstat (limited to 'site/templates')
| -rw-r--r-- | site/templates/about.liquid | 10 | ||||
| -rw-r--r-- | site/templates/index.liquid | 36 |
2 files changed, 23 insertions, 23 deletions
diff --git a/site/templates/about.liquid b/site/templates/about.liquid index 6c762b2..c693b61 100644 --- a/site/templates/about.liquid +++ b/site/templates/about.liquid @@ -1,9 +1,9 @@ <div class="entry page"> <span> - <span class="postname">{{page.title}}</span> - <span class="brady">{% for image in shape.images %}<a href="mailto:{{image.caption}}?subject=SAY HELLO!"><img src="{{ image.uri }}"></a>{% endfor %}</span> - <div class="content"> - {{page.body | newline_to_br}} - </div> + <span class="brady"> + <div class="aboutcontent">{{page.body | newline_to_br}}</div> + {% for image in shape.images %}<a href="mailto:{{image.caption}}?subject=SAY HELLO!" style="background-image:url({{ image.uri }})"><span>{{ image.label }}</span></a>{% endfor %} + <div class="contactcontent">{{page.contact | newline_to_br}}</div> + </span> </span> </div> diff --git a/site/templates/index.liquid b/site/templates/index.liquid index 4af22e4..573cfc0 100644 --- a/site/templates/index.liquid +++ b/site/templates/index.liquid @@ -181,22 +181,22 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends. </body> -<!-- if production else :-p --> -<!-- -<script src="assets/app.min.js"></script> ---> -<script src="assets/javascripts/mx/mx.skew.js"></script> -<script src="assets/javascripts/mx/extensions/mx.scene.js"></script> -<script src="assets/javascripts/mx/extensions/mx.unclampedOrbitCamera.js"></script> -<script src="assets/javascripts/mx/primitives/mx.image.js"></script> -<script src="assets/javascripts/vendor/jquery.min.js"></script> -<script src="assets/javascripts/vendor/froogaloop.js"></script> -<script src="assets/javascripts/vendor/fastclick.js"></script> -<script src="assets/javascripts/vendor/flickity.pkgd.js"></script> -<script src="assets/javascripts/vendor/loader.js"></script> -<script src="assets/javascripts/vendor/wheel.js"></script> -<script src="assets/javascripts/vendor/polyfill.js"></script> -<script src="assets/javascripts/vendor/util.js"></script> -<script src="assets/javascripts/_env.js"></script> -<script src="assets/javascripts/app.js"></script> +{% if meta.production %} + <script src="assets/app.min.js"></script> +{% else %} + <script src="assets/javascripts/mx/mx.skew.js"></script> + <script src="assets/javascripts/mx/extensions/mx.scene.js"></script> + <script src="assets/javascripts/mx/extensions/mx.unclampedOrbitCamera.js"></script> + <script src="assets/javascripts/mx/primitives/mx.image.js"></script> + <script src="assets/javascripts/vendor/jquery.min.js"></script> + <script src="assets/javascripts/vendor/froogaloop.js"></script> + <script src="assets/javascripts/vendor/fastclick.js"></script> + <script src="assets/javascripts/vendor/flickity.pkgd.js"></script> + <script src="assets/javascripts/vendor/loader.js"></script> + <script src="assets/javascripts/vendor/wheel.js"></script> + <script src="assets/javascripts/vendor/polyfill.js"></script> + <script src="assets/javascripts/vendor/util.js"></script> + <script src="assets/javascripts/_env.js"></script> + <script src="assets/javascripts/app.js"></script> +{% endif %} </html> |