Browse Source

Tweaks and more icons added to admin

Markus Ochel 12 years ago
parent
commit
c2ef7b4339
34 changed files with 419 additions and 236 deletions
  1. 1 1
      admin/controllers/essays.coffee
  2. 9 1
      admin/controllers/index.coffee
  3. 1 1
      admin/controllers/scenes.coffee
  4. 10 0
      admin/static/css/common.styl
  5. 63 0
      admin/static/css/icons.styl
  6. 1 0
      admin/static/css/index.styl
  7. 15 0
      admin/static/css/mixin.styl
  8. 36 20
      admin/static/css/theme.styl
  9. BIN
      admin/static/fonts/fontello-kleks-1.1.eot
  10. 0 88
      admin/static/fonts/fontello-kleks-1.1.svg
  11. BIN
      admin/static/fonts/fontello-kleks-1.1.ttf
  12. BIN
      admin/static/fonts/fontello-kleks-1.1.woff
  13. BIN
      admin/static/fonts/fontello-kleks-2.eot
  14. 93 0
      admin/static/fonts/fontello-kleks-2.svg
  15. BIN
      admin/static/fonts/fontello-kleks-2.ttf
  16. BIN
      admin/static/fonts/fontello-kleks-2.woff
  17. 7 6
      admin/templates/main-nav.html
  18. 2 2
      site/server/lists.coffee
  19. 14 10
      site/static/css/icons.styl
  20. 3 0
      site/static/css/responsive.styl
  21. 2 1
      site/static/css/setup-theme.styl
  22. 58 7
      site/static/css/theme.styl
  23. BIN
      site/static/fonts/fontello-kleks-1.1.eot
  24. 0 88
      site/static/fonts/fontello-kleks-1.1.svg
  25. BIN
      site/static/fonts/fontello-kleks-1.1.ttf
  26. BIN
      site/static/fonts/fontello-kleks-1.1.woff
  27. BIN
      site/static/fonts/fontello-kleks-2.eot
  28. 93 0
      site/static/fonts/fontello-kleks-2.svg
  29. BIN
      site/static/fonts/fontello-kleks-2.ttf
  30. BIN
      site/static/fonts/fontello-kleks-2.woff
  31. 2 2
      site/templates/base.html
  32. 5 5
      site/templates/collection.html
  33. 3 3
      site/templates/collections.html
  34. 1 1
      site/templates/doc.html

+ 1 - 1
admin/controllers/essays.coffee

@@ -136,7 +136,7 @@ class EssayForm extends Spine.Controller
       @previewUI?.close()
     else
       @form.addClass('fullscreen')
-      @fullscreenButton.html "< Exit #{@fullscreenButtonText}"
+      @fullscreenButton.html "Exit #{@fullscreenButtonText}"
       @previewUI = new PreviewUI field: @formBody
 
   import: (e) =>

+ 9 - 1
admin/controllers/index.coffee

@@ -50,6 +50,7 @@ class App extends Spine.Controller
     @mainStack = new MainStack
     @helpUI    = new HelpUI
     Spine.Route.setup()
+    @navigate('/')
 
     @hookPanelsToNav()
     @doOtherStuff()
@@ -98,10 +99,17 @@ class App extends Spine.Controller
 
   doOtherStuff: ->
     # Use the fastclick module for touch devices.
-    # Add a class of `needsclick` of the original click
+    # Add a class of `needsclick` if the original click
     # is needed.
     new FastClick(document.body)
 
+    # Alert user when leaving the application.
+    window.onbeforeunload = (e) ->
+      msg = 'Leaving Kleks now, but you may have unsaved items. Keep going if you are sure.'
+      e = window.event if not e?
+      e.returnValue = msg if e
+      msg
+
 
 module.exports = App
     

+ 1 - 1
admin/controllers/scenes.coffee

@@ -136,7 +136,7 @@ class SceneForm extends Spine.Controller
       @previewUI?.close()
     else
       @form.addClass('fullscreen')
-      @fullscreenButton.html "< Exit #{@fullscreenButtonText}"
+      @fullscreenButton.html "Exit #{@fullscreenButtonText}"
       @previewUI = new PreviewUI field: @formBody
 
   import: (e) =>

+ 10 - 0
admin/static/css/common.styl

@@ -165,6 +165,16 @@ button, .button
   &.glow
     outline: 4px solid rgba(yellow, 0.7)
 
+  &.right-arrow
+    iconic('\67', #fff, 'after')
+    &:after
+      margin-left: 0.5em
+
+  &.left-arrow
+    iconic('\66', #fff, 'before')
+    &:before
+      margin-right: 0.5em
+
 ::-webkit-input-placeholder
   color: #e3e3e3
 

+ 63 - 0
admin/static/css/icons.styl

@@ -0,0 +1,63 @@
+$ver = 2
+
+@font-face
+  font-family: 'fontello-kleks'
+  src: url("/static/fonts/fontello-kleks-"+$ver+".eot")
+  src: url("/static/fonts/fontello-kleks-"+$ver+".eot?#iefix") format('embedded-opentype'), url("/static/fonts/fontello-kleks-"+$ver+".woff") format('woff'), url("/static/fonts/fontello-kleks-"+$ver+".ttf") format('truetype'), url("/static/fonts/fontello-kleks-"+$ver+".svg#fontello-kleks") format('svg')
+  font-weight: normal
+  font-style: normal
+
+[class^="icon-"]:before
+[class*=" icon-"]:before
+  font-family: 'fontello-kleks'
+  font-style: normal
+  font-weight: normal
+  speak: none
+  display: inline-block
+  text-decoration: none
+  width: 1em
+  text-align: center
+  line-height: 1em
+  font-size: 1em
+
+
+.icon-pencil:before
+  content: '\6b' /* 'k' */
+.icon-eye:before
+  content: '\63' /* 'c' */
+.icon-eye-off:before
+  content: '\64' /* 'd' */
+.icon-profile:before
+  content: '\6e' /* 'n' */
+.icon-rss:before
+  content: '\6d' /* 'm' */
+.icon-down-open:before
+  content: '\65' /* 'e' */
+.icon-left-open:before
+  content: '\66' /* 'f' */
+.icon-right-open:before
+  content: '\67' /* 'g' */
+.icon-up-open:before
+  content: '\68' /* 'h' */
+.icon-collection:before
+  content: '\6a' /* 'j' */
+.icon-facebook:before
+  content: '\6f' /* 'o' */
+.icon-twitter:before
+  content: '\70' /* 'p' */
+.icon-google:before
+  content: '\71' /* 'q' */
+.icon-youtube:before
+  content: '\72' /* 'r' */
+.icon-scene:before
+  content: '\62' /* 'b' */
+.icon-video:before
+  content: '\61' /* 'a' */
+.icon-essay:before
+  content: '\69' /* 'i' */
+.icon-book:before
+  content: '\74' /* 't' */
+.icon-book-open:before
+  content: '\73' /* 's' */
+.icon-search:before
+  content: '\6c' /* 'l' */

+ 1 - 0
admin/static/css/index.styl

@@ -1,3 +1,4 @@
+@import './icons'
 // @import './bootstrap.css'
 @import './mixin'
 @import './common'

+ 15 - 0
admin/static/css/mixin.styl

@@ -163,6 +163,21 @@ arrow(direction = 'right', size = 10px, color = #666, width = 0.53em, length = 1
   border-{direction}-color: color;
   {direction}: 0.25em;
 
+iconic(content = '\67', color = $textColor, pos = 'before')
+  &:{pos}
+    content: content
+    font-family: 'fontello-kleks'
+    font-style: normal
+    font-weight: normal
+    speak: none
+    display: inline-block
+    text-decoration: none
+    width: 1em
+    text-align: center
+    line-height: 1em
+    font-size: 1em
+    color: color
+
 clearfix()
   *zoom: 1
   &:before, &:after

+ 36 - 20
admin/static/css/theme.styl

@@ -16,7 +16,7 @@ $navbarWidth  = 180px
   line-height: 1em
   font-weight: $normalFont
   color: #C4C4C4
-  letter-spacing: -0.07em
+  letter-spacing: -0.06em
   word-spacing: 0em
   white-space: nowrap
   a
@@ -181,12 +181,15 @@ span.label
         font-weight: $boldFont
         color: #fff
 
-        &:hover
+        &:hover, &:active
           background: darken($primaryColor, 5%)
 
         &.active
           background: darken($primaryColor, 10%)
 
+        .icon
+          margin-right: 0.5em
+
       &.seperator
         margin: 0.5em 0
         border-bottom: 1px solid rgba(255,255,255,0.2)
@@ -446,7 +449,7 @@ span.label
         input[name='title'],
         input[name='name']
           position: fixed
-          top: 0
+          top: 30px
           left: 20%
           right: 20%
           width: auto
@@ -457,12 +460,12 @@ span.label
         textarea[name='body'],
         textarea[name='content']
           position: fixed
-          top: 60px
+          top: 90px
           bottom: 0
           left: 20%
           right: 20%
           width: auto
-          height: 90%
+          height: 87%
           padding: 10px
           border: 0
           background: white
@@ -470,14 +473,17 @@ span.label
           z-index: 100
           transition(0.3s, all)
 
+        textarea[name='intro']
+          display: none
+
         .ui-preview
           position: fixed
-          top: 60px
+          top: 90px
           bottom: 0
           left: auto
           right: 10px
           width: 48%
-          height: 90%
+          height: 87%
           padding: 10px
           border: 0
           background: white
@@ -492,17 +498,16 @@ span.label
             right: auto
             width: 48%
 
-          textarea[name='intro']
-            display: none
-
         button.fullscreen-button
         .markdown-help:first-of-type
           position: fixed
-          top: 10px
-          left: 10px
+          top: 0
+          left: 20%
+          margin: 0
           padding: 0 10px
           font-size: 18px
           font-weight: 300
+          line-height: 1.5em
           background: darken($primaryColor, 5%)
           color: #fff
           border: 0
@@ -510,15 +515,18 @@ span.label
 
           &:hover
             background: darken($primaryColor, 10%)
+        
+        button.fullscreen-button
+          iconic('\66', #fff, 'before')
+          &:before
+            margin-right: 0.5em
 
         .markdown-help:first-of-type
-          position: fixed
-          top: 10px
           left: auto
-          right: 10px
+          right: 20%
 
           &:after
-            content: ' Help'
+            content: ' ?'
             color: #fff
 
 .stack .panel:not(.active)
@@ -634,9 +642,9 @@ ul.ui-multi-select
 
   > .button
     position: absolute
-    top: 10px
-    right: 10px
-    outline: 4px solid rgba(255,255,255,0.7)
+    top: 2px
+    right: 2px
+    outline: 2px solid rgba(255,255,255,0.7)
 
     &.preview-button
       right: 60px
@@ -647,7 +655,7 @@ ul.ui-multi-select
     bottom: 0
     right: 0
     left: 0
-    padding: 20px
+    padding: 0 20px 10px 20px
     overflow-y: scroll
     overflow-x: auto
     -webkit-overflow-scrolling: touch
@@ -657,6 +665,14 @@ ul.ui-multi-select
 
     ol, ul
       margin: 0 0.8em
+
+    p
+      
+      &.center
+        text-align: center
+
+      &.right
+        text-align: right
       
     a
       font-weight: $boldFont

BIN
admin/static/fonts/fontello-kleks-1.1.eot


+ 0 - 88
admin/static/fonts/fontello-kleks-1.1.svg

@@ -1,88 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-Created by FontForge 20100429 at Fri Nov  9 23:29:33 2012
- By root
-Copyright (C) 2012 by original authors @ fontello.com
-</metadata>
-<defs>
-<font id="fontello-kleks-1" horiz-adv-x="900" >
-  <font-face 
-    font-family="fontello-kleks-1"
-    font-weight="500"
-    font-stretch="normal"
-    units-per-em="1000"
-    panose-1="2 0 6 3 0 0 0 0 0 0"
-    ascent="800"
-    descent="-200"
-    x-height="800"
-    bbox="-2 -127 947 801"
-    underline-thickness="50"
-    underline-position="-100"
-    unicode-range="U+0061-0072"
-  />
-<missing-glyph horiz-adv-x="364" 
-d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
-    <glyph glyph-name=".notdef" horiz-adv-x="364" 
-d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
-    <glyph glyph-name=".null" horiz-adv-x="0" 
- />
-    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="333" 
- />
-    <glyph glyph-name="a" unicode="a" horiz-adv-x="947" 
-d="M-2 53v553q0 24 9.5 45.5t25.5 37.5t38 25.5t46 9.5h395q24 0 45.5 -9.5t38 -25.5t26 -37.5t9.5 -45.5v-178l264 286q9 10 21 10q5 0 11 -2q19 -9 19 -30v-726q0 -21 -19 -30q-18 -7 -32 8l-264 286v-177q0 -24 -9.5 -45.5t-26 -38t-38 -26t-45.5 -9.5h-395
-q-24 0 -46 9.5t-38 26t-25.5 38t-9.5 45.5z" />
-    <glyph glyph-name="b" unicode="b" horiz-adv-x="947" 
-d="M0 -7v672q0 24 17.5 41.5t41.5 17.5h829q25 0 42 -17.5t17 -41.5v-672q0 -24 -17 -41.5t-42 -17.5h-829q-24 0 -41.5 17.5t-17.5 41.5zM79 13h789v632h-789v-632zM158 92v54l142 185l97 -80l182 276l210 -218v-217h-631zM158 486q0 33 23 56.5t57 23.5q33 0 56 -23.5
-t23 -56.5t-23 -56t-56 -23q-34 0 -57 23t-23 56z" />
-    <glyph glyph-name="c" unicode="c" horiz-adv-x="947" 
-d="M0 305.5q0 22.5 13 42.5q40 64 91.5 115t111 86.5t124.5 54t134 18.5t134.5 -18.5t124.5 -53.5t110.5 -86t92.5 -116q11 -20 11 -42.5t-11 -41.5q-41 -66 -92.5 -117t-110.5 -85.5t-124.5 -53t-134.5 -18.5t-134 18.5t-124.5 53.5t-111 86t-91.5 116q-13 19 -13 41.5z
-M79 306q34 -54 77 -98t93.5 -74.5t107 -47.5t117.5 -17t117 17t106.5 47.5t94 74.5t76.5 98q-41 66 -96 116t-121 81q26 -31 40.5 -69t14.5 -82q0 -49 -18.5 -92t-51 -75.5t-75.5 -51t-92 -18.5t-91.5 18.5t-75.5 51t-51 75.5t-18 92q0 40 13 76.5t35 65.5
-q-60 -30 -111.5 -78t-90.5 -110zM316 352q0 -11 8.5 -20t21 -9t21 9t8.5 20q0 40 27 67.5t67 27.5q13 0 21.5 9t8.5 20q0 13 -8.5 21.5t-21.5 8.5q-31 0 -59.5 -12t-49 -32.5t-32.5 -49t-12 -60.5z" />
-    <glyph glyph-name="d" unicode="d" horiz-adv-x="947" 
-d="M0 328.5q0 22.5 13 42.5q40 64 91.5 115t111 86.5t124.5 54t134 18.5q27 0 54 -4t53 -9l45 81q5 8 13 10q6 3 15 -1l68 -39q7 -5 10 -12.5t-1 -15.5l-398 -710q-4 -8 -12 -10q-2 -1 -5 -1t-10 2l-69 39q-8 4 -10 12t2 16l34 59q-75 34 -138.5 91t-111.5 134
-q-13 19 -13 41.5zM79 329q42 -67 98.5 -117.5t123.5 -81.5l30 54q-45 32 -71.5 81.5t-26.5 109.5q0 40 13 76.5t35 66.5q-60 -31 -111.5 -78.5t-90.5 -110.5zM316 375q0 -11 8.5 -20t21 -9t21 9t8.5 20q0 40 27 67.5t67 27.5q13 0 21.5 9t8.5 20q0 13 -8.5 21.5t-21.5 8.5
-q-31 0 -59.5 -12t-49 -32.5t-32.5 -49t-12 -60.5zM477 13l45 82q107 13 196 74.5t150 159.5q-55 87 -134 145l39 71q47 -34 88 -77t75 -97q11 -20 11 -42.5t-11 -41.5q-82 -131 -201.5 -202t-257.5 -72zM556 155l146 262q2 -10 3 -20t1 -22q0 -38 -11 -72t-31 -62.5
-t-48 -50.5t-60 -35z" />
-    <glyph glyph-name="e" unicode="e" horiz-adv-x="789" 
-d="M0 406.5q0 19.5 15 34.5l51 52q15 15 35 15t35 -15l261 -262l257 262q14 15 34 15t35 -15l52 -52q14 -15 15 -34.5t-14 -34.5l-347 -346q-14 -15 -34 -15t-35 15l-345 346q-15 15 -15 34.5z" />
-    <glyph glyph-name="f" unicode="f" horiz-adv-x="495" 
-d="M0 327.5q0 19.5 15 34.5l345 346q15 15 35 15t34 -15l52 -52q15 -14 15 -34t-15 -35l-261 -262l261 -257q15 -15 15 -34.5t-15 -34.5l-52 -52q-14 -15 -34 -15t-35 15l-345 346q-15 15 -15 34.5z" />
-    <glyph glyph-name="g" unicode="g" horiz-adv-x="495" 
-d="M0 34q0 20 15 35l261 261l-261 258q-15 15 -15 34.5t15 33.5l51 53q15 15 35 15t35 -15l345 -346q15 -15 15 -35t-15 -35l-345 -345q-15 -15 -35 -15t-35 15l-51 51q-15 15 -15 35z" />
-    <glyph glyph-name="h" unicode="h" horiz-adv-x="789" 
-d="M-0.5 116.5q-0.5 19.5 14.5 34.5l346 346q15 15 35 15t34 -15l346 -346q14 -15 14 -34.5t-14 -33.5l-52 -53q-15 -15 -35 -15t-34 15l-261 262l-257 -262q-15 -15 -35 -15t-35 15l-51 53q-15 14 -15.5 33.5z" />
-    <glyph glyph-name="i" unicode="i" horiz-adv-x="705" 
-d="M353 320q139 0 237 -98.5t98 -236.5q0 -46 -33 -79t-79 -33h-446q-46 0 -79 33t-33 79q0 138 98 236.5t237 98.5zM186 599q0 167 167 167q168 0 168 -167q0 -168 -168 -168q-167 0 -167 168z" />
-    <glyph glyph-name="j" unicode="j" horiz-adv-x="928" 
-d="M18 153l446 -112l447 112v-112l-447 -111l-446 111v112zM18 376l446 -112l447 112v-112l-447 -111l-446 111v112zM18 599l446 112l447 -112v-111l-447 -112l-446 112v111z" />
-    <glyph glyph-name="k" unicode="k" horiz-adv-x="813" 
-d="M371 206l60 118l227 226q20 -12 33.5 -26t26.5 -34l-227 -226l-117 -60zM68 -96l112 444l238 236q80 22 164 0l-206 -205l-150 -78l-32 -177l97 -98l177 34l77 150l209 209q11 -47 10.5 -84t-6.5 -61l-7 -24l-236 -238l-445 -112z" />
-    <glyph glyph-name="l" unicode="l" 
-d="M613 432q0 102 -71.5 174t-173.5 72t-174 -72t-72 -174t72 -173.5t174 -71.5t173.5 71.5t71.5 173.5zM671 224l229 -230l-94 -94l-229 229q-95 -65 -209 -65q-152 0 -260 108t-108 260t108 260t260 108t260 -108t108 -260q0 -114 -65 -208z" />
-    <glyph glyph-name="m" unicode="m" 
-d="M900 45v-144h-900v144h900zM900 297v-144h-900v144h900zM900 549v-144h-900v144h900zM900 801v-144h-900v144h900z" />
-    <glyph glyph-name="n" unicode="n" 
-d="M225 12.5q0 -46.5 -33 -79.5t-79.5 -33t-79.5 33t-33 79.5t33 79.5t79.5 33t79.5 -33t33 -79.5zM594 -100h-173q0 175 -123 298t-298 123v173q161 0 298 -79.5t216.5 -216.5t79.5 -298zM900 -100h-174q0 148 -57.5 283t-154.5 232t-231.5 154.5t-282.5 57.5v173
-q183 0 349.5 -71.5t287 -192t192 -287t71.5 -349.5z" />
-    <glyph glyph-name="o" unicode="o" 
-d="M732 577l18 106q-39 13 -129 13q-71 0 -111 -52q-23 -30 -23 -107v-5v-33v-32h-71v-103h71v-360h134v360h106l8 103h-114v32v38v11q0 38 53 38q28 0 58 -9zM900 721v-742q0 -32 -23.5 -55.5t-55.5 -23.5h-742q-32 0 -55.5 23.5t-23.5 55.5v742q0 32 23.5 55.5t55.5 23.5
-h742q32 0 55.5 -23.5t23.5 -55.5z" />
-    <glyph glyph-name="p" unicode="p" horiz-adv-x="902" 
-d="M903 350q-39 -43 -108 -41q-34 -137 -160.5 -220t-273.5 -83q-109 0 -203 48t-158 136q68 -65 163 -65q102 0 172 75q-22 -4 -43.5 6.5t-21.5 31.5q0 24 37 40q-36 -4 -65.5 10t-46.5 46q20 22 62 25q-88 22 -100 92q24 7 47 7h8q-34 18 -56.5 46.5t-21.5 62.5l1 7
-q139 -53 231 -104q27 -16 69 -57q29 78 60.5 135.5t80.5 88.5q-1 -14 -14 -28q30 29 71 34q-3 -20 -48 -37q6 2 23 9t30 10.5t23 3.5q13 0 13 -10q0 -7 -15 -14t-38 -14t-25 -8q73 7 127.5 -46.5t68.5 -128.5q16 -5 32 -5q45 0 75 17q-12 -27 -39.5 -42t-59.5 -17
-q31 -14 75 -14q14 0 28 3z" />
-    <glyph glyph-name="q" unicode="q" 
-d="M421 189q0 -40 -38.5 -64t-81 -24t-77 21.5t-34.5 61.5q0 43 37 64.5t83 21.5q41 0 76 -21t35 -60zM372 499q0 -31 -14 -53.5t-44 -22.5q-39 0 -61.5 41t-22.5 82q0 32 13.5 54.5t43.5 22.5q39 0 62 -41t23 -83zM493 652q0 10 -20 10q-2 0 -46.5 0.5t-65.5 0t-54 -3.5
-t-53 -9q-52 -17 -83 -56t-31 -92q0 -63 39.5 -101.5t102.5 -37.5h5q0 -22 2 -32t4.5 -10.5t6.5 -4.5t8 -13q-50 0 -92.5 -10.5t-77 -43t-34.5 -82.5q0 -69 55.5 -103t129.5 -34q83 0 143.5 41t60.5 121q0 34 -17.5 65.5t-39 49.5t-39 34.5t-17.5 25.5q0 10 13.5 23t30 26
-t30 42t13.5 67q0 68 -39 96l13 1q13 2 18.5 3t15.5 4.5t14 9t4 13.5zM687 506h109v54h-109v110h-54v-110h-110v-54h110v-109h54v109zM900 721v-742q0 -32 -23.5 -55.5t-55.5 -23.5h-742q-32 0 -55.5 23.5t-23.5 55.5v742q0 32 23.5 55.5t55.5 23.5h742q32 0 55.5 -23.5
-t23.5 -55.5z" />
-    <glyph glyph-name="r" unicode="r" 
-d="M550 161v-120q0 -19 -16 -19q-13 0 -23 10v142q9 10 20 10q19 0 19 -23zM722 158v-25h-41v25q0 25 21 25q20 0 20 -25zM232 253h55v45h-161v-45h54v-264h52v264zM373 -11h45v228h-45v-173q-16 -17 -28 -17t-12 15v175h-47v-192q0 -39 33 -39q27 0 54 28v-25zM598 37v126
-q0 57 -45 57q-23 0 -42 -21v99h-47v-309h47v18q20 -21 44 -21q43 0 43 51zM770 54v17h-48q0 -2 0.5 -12t0 -14t-2.5 -10t-6.5 -9t-12.5 -3q-9 0 -14 5.5t-5.5 11t-0.5 15.5v43h89v58q0 31 -17.5 49t-48.5 18t-51 -18.5t-20 -48.5v-102q0 -32 17.5 -51.5t49.5 -19.5
-q70 0 70 71zM833 136q0 -44 -5 -131q-4 -45 -35 -71.5t-76 -28.5q-89 -4 -267 -4q-179 0 -267 4q-45 2 -76 28.5t-35 71.5q-5 87 -5 131t5 130q4 45 35 71.5t76 28.5q88 5 267 5t267 -5q45 -2 76 -28.5t35 -71.5q5 -86 5 -130zM284 801h65l-49 -149l-10 -24l-9 -25.5
-t-7 -24.5v-159h-64v151q-2 11 -26 77l-52 154h66l41 -152h5zM454 485v154q0 9 -8 15t-17 6t-16 -6t-7 -15v-154q0 -23 23 -23q25 0 25 23zM513 635v-145q0 -38 -22.5 -58t-61.5 -20q-37 0 -60 21t-23 57v146q0 35 25 53.5t61 18.5q34 0 57.5 -19.5t23.5 -53.5zM726 701v-282
-h-57v32q-34 -35 -67 -35q-40 0 -40 50v235h57v-216q0 -19 15.5 -19t34.5 22v213h57z" />
-  </font>
-</defs></svg>

BIN
admin/static/fonts/fontello-kleks-1.1.ttf


BIN
admin/static/fonts/fontello-kleks-1.1.woff


BIN
admin/static/fonts/fontello-kleks-2.eot


+ 93 - 0
admin/static/fonts/fontello-kleks-2.svg

@@ -0,0 +1,93 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+Created by FontForge 20100429 at Sat Nov 10 17:20:28 2012
+ By root
+Copyright (C) 2012 by original authors @ fontello.com
+</metadata>
+<defs>
+<font id="fontello-kleks" horiz-adv-x="927" >
+  <font-face 
+    font-family="fontello-kleks"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1000"
+    panose-1="2 0 6 3 0 0 0 0 0 0"
+    ascent="850"
+    descent="-150"
+    x-height="850"
+    bbox="14 -132 1015 850"
+    underline-thickness="50"
+    underline-position="-100"
+    unicode-range="U+0061-0074"
+  />
+<missing-glyph horiz-adv-x="364" 
+d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="364" 
+d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="333" 
+ />
+    <glyph glyph-name="a" unicode="a" horiz-adv-x="980" 
+d="M16 74v553q0 77 72 108q23 10 47 10h395q39 0 67 -20t42 -52q10 -22 10 -46v-178l264 286q9 10 21 10q15 0 23 -9t8 -23v-726q0 -20 -18 -28.5t-34 6.5l-264 286v-177q0 -39 -21 -67.5t-53 -41.5q-22 -10 -45 -10h-395q-39 0 -67.5 21t-42.5 53q-9 22 -9 45z" />
+    <glyph glyph-name="b" unicode="b" horiz-adv-x="979" 
+d="M75 -45q-24 0 -41.5 17.5t-17.5 41.5v672q0 24 17.5 41.5t41.5 17.5h830q24 0 41 -17.5t17 -41.5v-672q0 -24 -17 -41.5t-41 -17.5h-830zM885 34v632h-790v-632h790zM174 167l142 185l97 -80l182 276l211 -218v-217h-632v54zM174 507q0 33 23.5 56.5t56 23.5t56 -23
+t23.5 -57q0 -33 -23.5 -56t-55.5 -23q-34 0 -57 23t-23 56z" />
+    <glyph glyph-name="c" unicode="c" horiz-adv-x="979" 
+d="M28 392q124 198 328 255q65 19 134 19q135 0 259 -72q121 -71 203 -202q11 -21 11 -42q0 -22 -11 -42q-126 -199 -328 -255q-64 -19 -134 -19q-135 0 -258 72q-121 71 -204 202q-12 19 -12 42q0 21 12 42zM297 538q-123 -62 -202 -188q105 -168 278 -220q55 -17 117 -17
+q120 0 224 64q101 61 171 173q-86 136 -218 197q55 -65 55 -151q0 -98 -69.5 -167.5t-167 -69.5t-167 69.5t-69.5 167.5q0 76 48 142zM332 396q0 -11 9 -20t20.5 -9t20.5 9t9 20q0 40 27.5 67.5t66.5 27.5q12 0 21 9t9 21t-8.5 20.5t-21.5 8.5q-50 0 -87 -26.5t-55 -67.5
+q-11 -26 -11 -60z" />
+    <glyph glyph-name="d" unicode="d" horiz-adv-x="979" 
+d="M490 666q40 0 107 -13l45 81q11 18 28 9l68 -39q18 -10 9 -28l-398 -710q-4 -11 -17 -11q-1 0 -10 2l-69 39q-17 11 -8 28l34 59q-153 70 -251 225q-12 19 -12 41t12 43q124 198 328 255q65 19 134 19zM297 540q-129 -69 -202 -190q87 -138 222 -199l29 54
+q-97 72 -97 191q0 76 48 144zM332 396q0 -11 9 -20t20.5 -9t20.5 9t9 20q0 40 27.5 67.5t66.5 27.5q12 0 21 9t9 21t-8.5 20.5t-21.5 8.5q-50 0 -87 -26.5t-55 -67.5q-11 -26 -11 -60zM538 116q113 14 200.5 76.5t146.5 157.5q-55 86 -135 145l39 71q99 -71 163 -174
+q11 -21 11 -43q0 -21 -11 -41q-82 -131 -202 -202q-118 -70 -257 -72zM572 176l146 262q4 -17 4 -42q0 -113 -90 -185q-30 -23 -60 -35z" />
+    <glyph glyph-name="e" unicode="e" horiz-adv-x="896" 
+d="M78 570l370 -356l372 356q22 26 48 0q26 -22 0 -48l-396 -392q-22 -22 -48 0l-396 392q-26 26 0 48q24 24 50 0z" />
+    <glyph glyph-name="f" unicode="f" horiz-adv-x="495" 
+d="M467 -20q25 -26 0 -48q-25 -26 -48 0l-392 394q-24 24 0 50l392 394q23 26 48 0q25 -22 0 -48l-358 -372z" />
+    <glyph glyph-name="g" unicode="g" horiz-adv-x="495" 
+d="M28 -20l358 370l-358 372q-26 26 0 48q26 26 48 0l392 -394q24 -26 0 -50l-392 -394q-22 -26 -48 0q-26 22 0 48z" />
+    <glyph glyph-name="h" unicode="h" horiz-adv-x="894" 
+d="M819 130l-372 358l-370 -358q-26 -23 -50 0q-24 24 0 50l396 390q25 26 48 0l396 -390q24 -26 0 -50q-25 -22 -48 0z" />
+    <glyph glyph-name="i" unicode="i" horiz-adv-x="730" 
+d="M227 398h280v-90h-280v90zM615 800q42 0 71 -29t29 -71v-700q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-40 0 -70 30t-30 70v700q0 41 29.5 70.5t70.5 29.5h500zM615 700h-500v-700h500v700zM505 504h-280v88h280v-88zM505 200v-88h-280v88h280z" />
+    <glyph glyph-name="j" unicode="j" horiz-adv-x="928" 
+d="M18 228l446 -112l447 112v-112l-447 -111l-446 111v112zM18 451l446 -112l447 112v-112l-447 -111l-446 111v112zM18 674l446 112l447 -112v-111l-447 -112l-446 112v111z" />
+    <glyph glyph-name="k" unicode="k" horiz-adv-x="735" 
+d="M322 310l60 118l227 224q23 -14 33 -24q12 -12 27 -36l-227 -224l-117 -60zM19 8l112 442l238 238q80 22 165 0l-206 -206l-150 -77l-33 -177l97 -98l177 32l77 150l209 210q11 -46 10.5 -83.5t-6.5 -60.5l-7 -26l-236 -237l-445 -113z" />
+    <glyph glyph-name="l" unicode="l" 
+d="M914 44l-95 -94l-229 229q-95 -65 -208 -65q-152 0 -260 108t-108 260t108 260t260 108t260 -108t108 -260q0 -114 -65 -208zM626 482q0 102 -72 174t-172 72q-102 0 -174 -72t-72 -174t72 -174q71 -71 174 -71q101 0 172 71q72 72 72 174z" />
+    <glyph glyph-name="m" unicode="m" 
+d="M834 850q33 0 56.5 -23.5t23.5 -55.5v-742q0 -32 -23.5 -55.5t-56.5 -23.5h-741q-33 0 -56 23.5t-23 55.5v742q0 32 23 55.5t56 23.5h741zM781 82q0 134 -51.5 251t-133.5 198.5t-199 134t-251 52.5v-122q146 0 263 -72t181 -183q69 -118 69 -259h122zM565 82
+q0 120 -59 215t-150 148q-97 57 -210 57v-122q122 0 210 -87q87 -85 87 -211h122zM305 162q0 33 -23.5 56.5t-56.5 23.5q-32 0 -55.5 -24t-23.5 -56.5t23.5 -56t55.5 -23.5t56 23.5t24 56.5z" />
+    <glyph glyph-name="n" unicode="n" horiz-adv-x="1030" 
+d="M915 750q42 0 71 -29t29 -71v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-800q-40 0 -70 30t-30 70v600q0 41 29.5 70.5t70.5 29.5h800zM915 650h-800v-600h800v600zM465 156h-250v90h250v-90zM465 306h-250v90h250v-90zM465 456h-250v90h250v-90zM811 226l4 -70h-250
+q0 70 6 70q84 22 84 66q0 16 -27 56t-27 88q0 110 90 110t90 -110q0 -48 -28 -88t-28 -56q0 -20 20.5 -35.5t43.5 -22.5z" />
+    <glyph glyph-name="o" unicode="o" 
+d="M834 850q33 0 56.5 -23.5t23.5 -55.5v-742q0 -32 -23.5 -55.5t-56.5 -23.5h-741q-33 0 -56 23.5t-23 55.5v742q0 32 23 55.5t56 23.5h741zM745 627l18 106q-39 13 -129 13q-72 0 -110 -52q-24 -31 -24 -107v-70h-71v-103h71v-360h134v360h107l8 103h-115v81q0 38 54 38
+q29 0 57 -9z" />
+    <glyph glyph-name="p" unicode="p" horiz-adv-x="929" 
+d="M916 425q-36 -41 -102 -41h-6q-34 -138 -160 -220q-128 -83 -274 -83q-117 0 -209 50.5t-151 133.5q67 -65 162 -65q102 0 172 75q-3 -1 -10 -1l-33 7q-21 11 -21 32q0 24 36 40q-6 -1 -17 -1q-65 0 -94 57q20 23 62 25q-89 22 -101 92q26 7 48 7h7q-85 47 -77 116
+q138 -52 232 -104q26 -15 68 -57q28 77 61 135q35 60 81 89q-1 -14 -14 -28q31 29 70 35q-2 -21 -48 -37q1 0 31 11t45 11q14 0 14 -10q0 -9 -16 -16t-37.5 -12.5t-25.5 -7.5q7 1 17 1q69 0 117.5 -53.5t62.5 -121.5q16 -6 32 -6q46 0 75 17q-11 -25 -38 -41t-61 -18
+q30 -14 74 -14q15 0 28 3z" />
+    <glyph glyph-name="q" unicode="q" 
+d="M834 850q33 0 56.5 -23.5t23.5 -55.5v-742q0 -32 -23.5 -55.5t-56.5 -23.5h-741q-33 0 -56 23.5t-23 55.5v742q0 32 23 55.5t56 23.5h741zM809 556v54h-109v110h-54v-110h-110v-54h110v-109h54v109h109zM292 413h9q0 -41 6 -42q9 -1 14 -18q-112 0 -169 -54
+q-34 -32 -34 -82q0 -70 55 -103.5t129 -33.5q83 0 144 41t61 121q0 33 -17.5 65t-39.5 50q-22 17 -40 34q-17 16 -17 26q0 9 14 23q9 9 30 27q19 14 31.5 44t12.5 64q0 67 -40 96q20 0 48 8q18 6 18 23q0 10 -20 10q-2 1 -47 1h-65q-65 0 -108 -13q-50 -17 -82 -54.5
+t-32 -93.5q0 -62 38.5 -100.5t100.5 -38.5zM385 549q0 -33 -14.5 -54.5t-42.5 -21.5q-38 0 -62 40q-23 42 -23 83q0 34 14.5 55.5t43.5 21.5q37 0 61 -41q23 -41 23 -83zM435 239q0 -40 -39 -64q-40 -24 -81 -24q-42 0 -77 21t-35 62q0 43 37 64.5t83 21.5q43 0 77 -21
+q35 -21 35 -60z" />
+    <glyph glyph-name="r" unicode="r" horiz-adv-x="793" 
+d="M673 468h-57v32q-35 -35 -67 -35q-41 0 -41 50v235h58v-216q0 -19 15.5 -19t34.5 22v213h57v-282zM379 757q35 0 58 -19.5t23 -53.5v-145q0 -37 -22.5 -57.5t-61.5 -20.5q-37 0 -60 21.5t-23 57.5v145q0 35 24.5 53.5t61.5 18.5zM376 709q-9 0 -16 -6t-7 -15v-154
+q0 -23 23 -23q25 0 25 23v154q0 8 -8 14.5t-17 6.5zM230 850h66l-49 -148q-1 -2 -11.5 -31t-14.5 -44v-159h-64v152q-1 8 -27 76l-51 154h66l41 -152h5zM775 54q-4 -43 -34.5 -70.5t-76.5 -29.5q-99 -4 -267 -4q-170 0 -267 4q-46 2 -77 29.5t-34 70.5q-5 87 -5 131t5 130
+q3 44 34 71.5t77 28.5q97 5 267 5t267 -5q46 -1 76.5 -28.5t34.5 -71.5q5 -86 5 -130t-5 -131zM580 103q0 -32 17.5 -51.5t49.5 -19.5q69 0 69 71v17h-47v-10v-10q0 -3 -0.5 -8.5t-2 -8t-3.5 -5.5t-6 -4.5t-9 -1.5q-20 0 -20 32v43h88v58q0 31 -17 49t-48 18t-51 -19
+t-20 -48v-102zM544 212q0 57 -44 57q-23 0 -42 -21v99h-47v-309h47v18q21 -20 44 -20q42 0 42 50v126zM365 38v228h-45v-173q-15 -17 -28 -17q-12 0 -12 15v175h-47v-192q0 -39 33 -39q26 0 54 28v-25h45zM234 302v45h-161v-45h54v-264h52v264h55zM669 182h-41v25
+q0 25 21 25q20 0 20 -25v-25zM497 210v-120q0 -18 -16 -18q-13 0 -23 9v143q9 9 20 9q19 0 19 -23z" />
+    <glyph glyph-name="s" unicode="s" horiz-adv-x="930" 
+d="M355 238v-68l-200 80v68zM355 446v-68l-200 80v68zM465 -100q-1 0 -5 1t-5 1l-10 2l-398 160q-32 12 -32 46v640q0 30 22 42q22 16 46 6l382 -154l382 154q24 10 46 -6q22 -12 22 -42v-640q0 -34 -32 -46l-398 -160q-2 0 -5 -1q-4 -1 -5 -1t-5 -1t-5 -1zM415 4v560
+l-320 128v-560zM835 132v560l-320 -128v-560zM775 318v-68l-200 -80v68zM775 526v-68l-200 -80v68z" />
+    <glyph glyph-name="t" unicode="t" horiz-adv-x="730" 
+d="M697 594q18 -8 18 -28v-562q0 -14 -12.5 -25t-27.5 -11q-46 0 -46 36v522q0 12 -12 18l-404 216q-31 10 -68 -10q-44 -20 -56 -44l408 -228q18 -8 18 -28v-550q0 -22 -18 -28q-5 -4 -16 -4q-15 0 -20 4q-13 9 -209 130l-205 128q-26 18 -26 34l-6 524q0 27 14 52
+q28 45 102 77t116 9z" />
+  </font>
+</defs></svg>

BIN
admin/static/fonts/fontello-kleks-2.ttf


BIN
admin/static/fonts/fontello-kleks-2.woff


+ 7 - 6
admin/templates/main-nav.html

@@ -1,19 +1,20 @@
-<div class="app-logo"><a href="/">kleks</a></div>
+<div class="app-logo"><a href="#/">kleks</a></div>
 <form class="login">
   <input type="text" name="username" placeholder="Username" spellcheck="false" autofocus>
   <input type="password" name="password" placeholder="Password" spellcheck="false">
   <input type="submit" name="submit" value="Sign In" class="button">
 </form>
 <ul>
-  <li class="dashboards"><a class="active" href="#/">Dashboard</a></li>
-  <li class="essays"><a href="#/essays">Essays</a></li>
-  <li class="scenes"><a href="#/scenes">Scenes</a></li>
-  <li class="collections"><a href="#/collections">Collections</a></li>
-  <li class="sponsors"><a href="#/sponsors">Sponsors</a></li>
+  <li class="essays"><a href="#/essays"><i class="icon icon-essay"></i>Essays</a></li>
+  <!-- <li class="videos"><a href="#/videos"><i class="icon icon-video"></i>Videos</a></li> -->
+  <li class="scenes"><a href="#/scenes"><i class="icon icon-scene"></i>Scenes</a></li>
+  <!-- <li class="profiles"><a href="#/profiles"><i class="icon icon-profile"></i>Profiles</a></li> -->
+  <li class="collections"><a href="#/collections"><i class="icon icon-collection"></i>Collections</a></li>
   <li class="seperator"></li>
   <li class="sites"><a href="#/sites">Sites</a></li>
   <li class="blocks"><a href="#/blocks">Blocks</a></li>
   <li class="authors"><a href="#/authors">Authors</a></li>
+  <li class="sponsors"><a href="#/sponsors">Sponsors</a></li>
   <li class="contacts"><a href="#/contacts">Contacts</a></li>
   <li class="seperator"></li>
   <li class="logout"><a class="logout-button">Sign Out</a></li>

+ 2 - 2
site/server/lists.coffee

@@ -122,7 +122,7 @@ exports.collection = (head, req) ->
         title: collection.name
         description: collection.intro
         type: 'website'
-        image: collection.photo
+        image: "#{site.link}/file/#{collection._id}/#{collection.photo}"
     }
   else
     return {
@@ -265,7 +265,7 @@ exports.doc = (head, req) ->
         title: doc.title
         description: doc.intro
         type: 'article'
-        image: doc.photo
+        image: "#{site.link}/file/#{doc._id}/#{doc.photo}"
         first_name: author?.name.split(' ')[0]
         last_name: author?.name.split(' ')[1]
         published: doc.published_at

+ 14 - 10
site/static/css/icons.styl

@@ -1,15 +1,15 @@
-$ver = 1
+$ver = 2
 
 @font-face
-  font-family: 'fontello-kleks-1'
-  src: url("/static/fonts/fontello-kleks-1."+$ver+".eot")
-  src: url("/static/fonts/fontello-kleks-1."+$ver+".eot?#iefix") format('embedded-opentype'), url("/static/fonts/fontello-kleks-1."+$ver+".woff") format('woff'), url("/static/fonts/fontello-kleks-1."+$ver+".ttf") format('truetype'), url("/static/fonts/fontello-kleks-1."+$ver+".svg#fontello-kleks-1") format('svg')
+  font-family: 'fontello-kleks'
+  src: url("/static/fonts/fontello-kleks-"+$ver+".eot")
+  src: url("/static/fonts/fontello-kleks-"+$ver+".eot?#iefix") format('embedded-opentype'), url("/static/fonts/fontello-kleks-"+$ver+".woff") format('woff'), url("/static/fonts/fontello-kleks-"+$ver+".ttf") format('truetype'), url("/static/fonts/fontello-kleks-"+$ver+".svg#fontello-kleks") format('svg')
   font-weight: normal
   font-style: normal
 
 [class^="icon-"]:before
 [class*=" icon-"]:before
-  font-family: 'fontello-kleks-1'
+  font-family: 'fontello-kleks'
   font-style: normal
   font-weight: normal
   speak: none
@@ -21,16 +21,16 @@ $ver = 1
   font-size: 1em
 
 
-.icon-essay:before
-  content: '\6d' /* 'm' */
-.icon-pencil-alt:before
+.icon-pencil:before
   content: '\6b' /* 'k' */
 .icon-eye:before
   content: '\63' /* 'c' */
 .icon-eye-off:before
   content: '\64' /* 'd' */
-.icon-rss:before
+.icon-profile:before
   content: '\6e' /* 'n' */
+.icon-rss:before
+  content: '\6d' /* 'm' */
 .icon-down-open:before
   content: '\65' /* 'e' */
 .icon-left-open:before
@@ -53,7 +53,11 @@ $ver = 1
   content: '\62' /* 'b' */
 .icon-video:before
   content: '\61' /* 'a' */
-.icon-profile:before
+.icon-essay:before
   content: '\69' /* 'i' */
+.icon-book:before
+  content: '\74' /* 't' */
+.icon-book-open:before
+  content: '\73' /* 's' */
 .icon-search:before
   content: '\6c' /* 'l' */

+ 3 - 0
site/static/css/responsive.styl

@@ -75,6 +75,9 @@
       > li
         width: 100%
         margin: 0.8em 0 0 0
+      &.with-borders > li
+        width: 100%
+        margin: 0.8em 0 0 0
 
   article.home
     .collections

+ 2 - 1
site/static/css/setup-theme.styl

@@ -61,7 +61,8 @@ setupTheme($primaryColor = $blueColor, $secondaryColor = $lightGrey, $linkColor
         background: $primaryColor
 
   article.home
-    .collections    
+    .collections 
+      border-color: $primaryColor
       > ul
         > li
           .updated

+ 58 - 7
site/static/css/theme.styl

@@ -13,7 +13,7 @@
   line-height: 0.8em
   font-weight: $normalFont
   color: #C4C4C4
-  letter-spacing: -0.07em
+  letter-spacing: -0.06em
   word-spacing: 0em
   white-space: nowrap
   a
@@ -56,7 +56,7 @@
     padding: 10px
     background: $primaryColor
     cursor: pointer
-    outline: 4px solid #fff
+    outline: 5px solid rgba(255,255,255,0.9)
     white-space: nowrap
 
     &:hover, &:active
@@ -171,7 +171,7 @@
 
       a
         font-size: 1em
-        line-height: 1em
+        line-height: 1.15em
 
 .collection-nav
   // see above
@@ -215,6 +215,14 @@ article
 
   ol, ul
     margin: 0 0.8em
+
+  p
+    
+    &.center
+      text-align: center
+
+    &.right
+      text-align: right
   
   &.view
     a
@@ -228,6 +236,9 @@ article
       color: $textDarkColor
       font-weight: $normalFont
 
+      .icon
+        margin-right: 0.4em
+
     small
       font-size: 0.5em
       margin-left: 0.5em
@@ -296,6 +307,18 @@ article
 
     > li
       margin-bottom: 2.5em
+
+      h3
+        padding-left: 2em
+
+        a
+          .icon
+            margin-left: -2em
+            margin-right: 0.5em
+            color: $textColor
+
+            &.fresh-true
+              // color: $textColor
       
       .date
         display: none
@@ -304,7 +327,7 @@ article
         color: $lightGrey
 
         &.fresh-true
-          // display: block
+          display: block
 
       .meta
         font-size: 0.875em
@@ -327,14 +350,25 @@ article
       vertical-align: top
 
     &.with-borders > li
+      width: 47%
+      padding: 1em
+      margin: 0.5em 0.4em
       border: solid 1px $faintGrey
 
 article.home
 
   .collections
+    margin-top: 2em
+    padding-top: 2em
+    border-top: 1px solid $primaryColor
+    clear: both
 
     > h3
-      margin-bottom: 0.5em
+      margin-top: 0
+      color: $lightGrey
+      font-size: 1.5em
+      text-align: center
+      text-transform: uppercase
     
     > ul
       list-style-type: none
@@ -345,9 +379,10 @@ article.home
       > li
         display: inline-block
         position: relative
-        width: 48%
+        width: 47%
         padding: 0
-        margin: 0.8em 0.5em 0 0
+        margin: 0.5em 0.4em
+        vertical-align: top
         border: solid 1px $faintGrey
 
         .name
@@ -355,6 +390,13 @@ article.home
           a
             display: block
             padding: 1em
+            
+            .icon
+              float: right
+              margin-left: 0.3em
+
+              &.fresh-true
+                // color: $textColor
 
         .updated
           display: none
@@ -381,6 +423,15 @@ article.home
             color: $primaryColor
             background: #fff
 
+article.collection
+
+  > .title
+
+    a
+      .icon
+        position: relative
+        top: 2px
+
 article.essay
 
   .meta

BIN
site/static/fonts/fontello-kleks-1.1.eot


+ 0 - 88
site/static/fonts/fontello-kleks-1.1.svg

@@ -1,88 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-Created by FontForge 20100429 at Fri Nov  9 23:29:33 2012
- By root
-Copyright (C) 2012 by original authors @ fontello.com
-</metadata>
-<defs>
-<font id="fontello-kleks-1" horiz-adv-x="900" >
-  <font-face 
-    font-family="fontello-kleks-1"
-    font-weight="500"
-    font-stretch="normal"
-    units-per-em="1000"
-    panose-1="2 0 6 3 0 0 0 0 0 0"
-    ascent="800"
-    descent="-200"
-    x-height="800"
-    bbox="-2 -127 947 801"
-    underline-thickness="50"
-    underline-position="-100"
-    unicode-range="U+0061-0072"
-  />
-<missing-glyph horiz-adv-x="364" 
-d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
-    <glyph glyph-name=".notdef" horiz-adv-x="364" 
-d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
-    <glyph glyph-name=".null" horiz-adv-x="0" 
- />
-    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="333" 
- />
-    <glyph glyph-name="a" unicode="a" horiz-adv-x="947" 
-d="M-2 53v553q0 24 9.5 45.5t25.5 37.5t38 25.5t46 9.5h395q24 0 45.5 -9.5t38 -25.5t26 -37.5t9.5 -45.5v-178l264 286q9 10 21 10q5 0 11 -2q19 -9 19 -30v-726q0 -21 -19 -30q-18 -7 -32 8l-264 286v-177q0 -24 -9.5 -45.5t-26 -38t-38 -26t-45.5 -9.5h-395
-q-24 0 -46 9.5t-38 26t-25.5 38t-9.5 45.5z" />
-    <glyph glyph-name="b" unicode="b" horiz-adv-x="947" 
-d="M0 -7v672q0 24 17.5 41.5t41.5 17.5h829q25 0 42 -17.5t17 -41.5v-672q0 -24 -17 -41.5t-42 -17.5h-829q-24 0 -41.5 17.5t-17.5 41.5zM79 13h789v632h-789v-632zM158 92v54l142 185l97 -80l182 276l210 -218v-217h-631zM158 486q0 33 23 56.5t57 23.5q33 0 56 -23.5
-t23 -56.5t-23 -56t-56 -23q-34 0 -57 23t-23 56z" />
-    <glyph glyph-name="c" unicode="c" horiz-adv-x="947" 
-d="M0 305.5q0 22.5 13 42.5q40 64 91.5 115t111 86.5t124.5 54t134 18.5t134.5 -18.5t124.5 -53.5t110.5 -86t92.5 -116q11 -20 11 -42.5t-11 -41.5q-41 -66 -92.5 -117t-110.5 -85.5t-124.5 -53t-134.5 -18.5t-134 18.5t-124.5 53.5t-111 86t-91.5 116q-13 19 -13 41.5z
-M79 306q34 -54 77 -98t93.5 -74.5t107 -47.5t117.5 -17t117 17t106.5 47.5t94 74.5t76.5 98q-41 66 -96 116t-121 81q26 -31 40.5 -69t14.5 -82q0 -49 -18.5 -92t-51 -75.5t-75.5 -51t-92 -18.5t-91.5 18.5t-75.5 51t-51 75.5t-18 92q0 40 13 76.5t35 65.5
-q-60 -30 -111.5 -78t-90.5 -110zM316 352q0 -11 8.5 -20t21 -9t21 9t8.5 20q0 40 27 67.5t67 27.5q13 0 21.5 9t8.5 20q0 13 -8.5 21.5t-21.5 8.5q-31 0 -59.5 -12t-49 -32.5t-32.5 -49t-12 -60.5z" />
-    <glyph glyph-name="d" unicode="d" horiz-adv-x="947" 
-d="M0 328.5q0 22.5 13 42.5q40 64 91.5 115t111 86.5t124.5 54t134 18.5q27 0 54 -4t53 -9l45 81q5 8 13 10q6 3 15 -1l68 -39q7 -5 10 -12.5t-1 -15.5l-398 -710q-4 -8 -12 -10q-2 -1 -5 -1t-10 2l-69 39q-8 4 -10 12t2 16l34 59q-75 34 -138.5 91t-111.5 134
-q-13 19 -13 41.5zM79 329q42 -67 98.5 -117.5t123.5 -81.5l30 54q-45 32 -71.5 81.5t-26.5 109.5q0 40 13 76.5t35 66.5q-60 -31 -111.5 -78.5t-90.5 -110.5zM316 375q0 -11 8.5 -20t21 -9t21 9t8.5 20q0 40 27 67.5t67 27.5q13 0 21.5 9t8.5 20q0 13 -8.5 21.5t-21.5 8.5
-q-31 0 -59.5 -12t-49 -32.5t-32.5 -49t-12 -60.5zM477 13l45 82q107 13 196 74.5t150 159.5q-55 87 -134 145l39 71q47 -34 88 -77t75 -97q11 -20 11 -42.5t-11 -41.5q-82 -131 -201.5 -202t-257.5 -72zM556 155l146 262q2 -10 3 -20t1 -22q0 -38 -11 -72t-31 -62.5
-t-48 -50.5t-60 -35z" />
-    <glyph glyph-name="e" unicode="e" horiz-adv-x="789" 
-d="M0 406.5q0 19.5 15 34.5l51 52q15 15 35 15t35 -15l261 -262l257 262q14 15 34 15t35 -15l52 -52q14 -15 15 -34.5t-14 -34.5l-347 -346q-14 -15 -34 -15t-35 15l-345 346q-15 15 -15 34.5z" />
-    <glyph glyph-name="f" unicode="f" horiz-adv-x="495" 
-d="M0 327.5q0 19.5 15 34.5l345 346q15 15 35 15t34 -15l52 -52q15 -14 15 -34t-15 -35l-261 -262l261 -257q15 -15 15 -34.5t-15 -34.5l-52 -52q-14 -15 -34 -15t-35 15l-345 346q-15 15 -15 34.5z" />
-    <glyph glyph-name="g" unicode="g" horiz-adv-x="495" 
-d="M0 34q0 20 15 35l261 261l-261 258q-15 15 -15 34.5t15 33.5l51 53q15 15 35 15t35 -15l345 -346q15 -15 15 -35t-15 -35l-345 -345q-15 -15 -35 -15t-35 15l-51 51q-15 15 -15 35z" />
-    <glyph glyph-name="h" unicode="h" horiz-adv-x="789" 
-d="M-0.5 116.5q-0.5 19.5 14.5 34.5l346 346q15 15 35 15t34 -15l346 -346q14 -15 14 -34.5t-14 -33.5l-52 -53q-15 -15 -35 -15t-34 15l-261 262l-257 -262q-15 -15 -35 -15t-35 15l-51 53q-15 14 -15.5 33.5z" />
-    <glyph glyph-name="i" unicode="i" horiz-adv-x="705" 
-d="M353 320q139 0 237 -98.5t98 -236.5q0 -46 -33 -79t-79 -33h-446q-46 0 -79 33t-33 79q0 138 98 236.5t237 98.5zM186 599q0 167 167 167q168 0 168 -167q0 -168 -168 -168q-167 0 -167 168z" />
-    <glyph glyph-name="j" unicode="j" horiz-adv-x="928" 
-d="M18 153l446 -112l447 112v-112l-447 -111l-446 111v112zM18 376l446 -112l447 112v-112l-447 -111l-446 111v112zM18 599l446 112l447 -112v-111l-447 -112l-446 112v111z" />
-    <glyph glyph-name="k" unicode="k" horiz-adv-x="813" 
-d="M371 206l60 118l227 226q20 -12 33.5 -26t26.5 -34l-227 -226l-117 -60zM68 -96l112 444l238 236q80 22 164 0l-206 -205l-150 -78l-32 -177l97 -98l177 34l77 150l209 209q11 -47 10.5 -84t-6.5 -61l-7 -24l-236 -238l-445 -112z" />
-    <glyph glyph-name="l" unicode="l" 
-d="M613 432q0 102 -71.5 174t-173.5 72t-174 -72t-72 -174t72 -173.5t174 -71.5t173.5 71.5t71.5 173.5zM671 224l229 -230l-94 -94l-229 229q-95 -65 -209 -65q-152 0 -260 108t-108 260t108 260t260 108t260 -108t108 -260q0 -114 -65 -208z" />
-    <glyph glyph-name="m" unicode="m" 
-d="M900 45v-144h-900v144h900zM900 297v-144h-900v144h900zM900 549v-144h-900v144h900zM900 801v-144h-900v144h900z" />
-    <glyph glyph-name="n" unicode="n" 
-d="M225 12.5q0 -46.5 -33 -79.5t-79.5 -33t-79.5 33t-33 79.5t33 79.5t79.5 33t79.5 -33t33 -79.5zM594 -100h-173q0 175 -123 298t-298 123v173q161 0 298 -79.5t216.5 -216.5t79.5 -298zM900 -100h-174q0 148 -57.5 283t-154.5 232t-231.5 154.5t-282.5 57.5v173
-q183 0 349.5 -71.5t287 -192t192 -287t71.5 -349.5z" />
-    <glyph glyph-name="o" unicode="o" 
-d="M732 577l18 106q-39 13 -129 13q-71 0 -111 -52q-23 -30 -23 -107v-5v-33v-32h-71v-103h71v-360h134v360h106l8 103h-114v32v38v11q0 38 53 38q28 0 58 -9zM900 721v-742q0 -32 -23.5 -55.5t-55.5 -23.5h-742q-32 0 -55.5 23.5t-23.5 55.5v742q0 32 23.5 55.5t55.5 23.5
-h742q32 0 55.5 -23.5t23.5 -55.5z" />
-    <glyph glyph-name="p" unicode="p" horiz-adv-x="902" 
-d="M903 350q-39 -43 -108 -41q-34 -137 -160.5 -220t-273.5 -83q-109 0 -203 48t-158 136q68 -65 163 -65q102 0 172 75q-22 -4 -43.5 6.5t-21.5 31.5q0 24 37 40q-36 -4 -65.5 10t-46.5 46q20 22 62 25q-88 22 -100 92q24 7 47 7h8q-34 18 -56.5 46.5t-21.5 62.5l1 7
-q139 -53 231 -104q27 -16 69 -57q29 78 60.5 135.5t80.5 88.5q-1 -14 -14 -28q30 29 71 34q-3 -20 -48 -37q6 2 23 9t30 10.5t23 3.5q13 0 13 -10q0 -7 -15 -14t-38 -14t-25 -8q73 7 127.5 -46.5t68.5 -128.5q16 -5 32 -5q45 0 75 17q-12 -27 -39.5 -42t-59.5 -17
-q31 -14 75 -14q14 0 28 3z" />
-    <glyph glyph-name="q" unicode="q" 
-d="M421 189q0 -40 -38.5 -64t-81 -24t-77 21.5t-34.5 61.5q0 43 37 64.5t83 21.5q41 0 76 -21t35 -60zM372 499q0 -31 -14 -53.5t-44 -22.5q-39 0 -61.5 41t-22.5 82q0 32 13.5 54.5t43.5 22.5q39 0 62 -41t23 -83zM493 652q0 10 -20 10q-2 0 -46.5 0.5t-65.5 0t-54 -3.5
-t-53 -9q-52 -17 -83 -56t-31 -92q0 -63 39.5 -101.5t102.5 -37.5h5q0 -22 2 -32t4.5 -10.5t6.5 -4.5t8 -13q-50 0 -92.5 -10.5t-77 -43t-34.5 -82.5q0 -69 55.5 -103t129.5 -34q83 0 143.5 41t60.5 121q0 34 -17.5 65.5t-39 49.5t-39 34.5t-17.5 25.5q0 10 13.5 23t30 26
-t30 42t13.5 67q0 68 -39 96l13 1q13 2 18.5 3t15.5 4.5t14 9t4 13.5zM687 506h109v54h-109v110h-54v-110h-110v-54h110v-109h54v109zM900 721v-742q0 -32 -23.5 -55.5t-55.5 -23.5h-742q-32 0 -55.5 23.5t-23.5 55.5v742q0 32 23.5 55.5t55.5 23.5h742q32 0 55.5 -23.5
-t23.5 -55.5z" />
-    <glyph glyph-name="r" unicode="r" 
-d="M550 161v-120q0 -19 -16 -19q-13 0 -23 10v142q9 10 20 10q19 0 19 -23zM722 158v-25h-41v25q0 25 21 25q20 0 20 -25zM232 253h55v45h-161v-45h54v-264h52v264zM373 -11h45v228h-45v-173q-16 -17 -28 -17t-12 15v175h-47v-192q0 -39 33 -39q27 0 54 28v-25zM598 37v126
-q0 57 -45 57q-23 0 -42 -21v99h-47v-309h47v18q20 -21 44 -21q43 0 43 51zM770 54v17h-48q0 -2 0.5 -12t0 -14t-2.5 -10t-6.5 -9t-12.5 -3q-9 0 -14 5.5t-5.5 11t-0.5 15.5v43h89v58q0 31 -17.5 49t-48.5 18t-51 -18.5t-20 -48.5v-102q0 -32 17.5 -51.5t49.5 -19.5
-q70 0 70 71zM833 136q0 -44 -5 -131q-4 -45 -35 -71.5t-76 -28.5q-89 -4 -267 -4q-179 0 -267 4q-45 2 -76 28.5t-35 71.5q-5 87 -5 131t5 130q4 45 35 71.5t76 28.5q88 5 267 5t267 -5q45 -2 76 -28.5t35 -71.5q5 -86 5 -130zM284 801h65l-49 -149l-10 -24l-9 -25.5
-t-7 -24.5v-159h-64v151q-2 11 -26 77l-52 154h66l41 -152h5zM454 485v154q0 9 -8 15t-17 6t-16 -6t-7 -15v-154q0 -23 23 -23q25 0 25 23zM513 635v-145q0 -38 -22.5 -58t-61.5 -20q-37 0 -60 21t-23 57v146q0 35 25 53.5t61 18.5q34 0 57.5 -19.5t23.5 -53.5zM726 701v-282
-h-57v32q-34 -35 -67 -35q-40 0 -40 50v235h57v-216q0 -19 15.5 -19t34.5 22v213h57z" />
-  </font>
-</defs></svg>

BIN
site/static/fonts/fontello-kleks-1.1.ttf


BIN
site/static/fonts/fontello-kleks-1.1.woff


BIN
site/static/fonts/fontello-kleks-2.eot


+ 93 - 0
site/static/fonts/fontello-kleks-2.svg

@@ -0,0 +1,93 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+Created by FontForge 20100429 at Sat Nov 10 17:20:28 2012
+ By root
+Copyright (C) 2012 by original authors @ fontello.com
+</metadata>
+<defs>
+<font id="fontello-kleks" horiz-adv-x="927" >
+  <font-face 
+    font-family="fontello-kleks"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1000"
+    panose-1="2 0 6 3 0 0 0 0 0 0"
+    ascent="850"
+    descent="-150"
+    x-height="850"
+    bbox="14 -132 1015 850"
+    underline-thickness="50"
+    underline-position="-100"
+    unicode-range="U+0061-0074"
+  />
+<missing-glyph horiz-adv-x="364" 
+d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="364" 
+d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="333" 
+ />
+    <glyph glyph-name="a" unicode="a" horiz-adv-x="980" 
+d="M16 74v553q0 77 72 108q23 10 47 10h395q39 0 67 -20t42 -52q10 -22 10 -46v-178l264 286q9 10 21 10q15 0 23 -9t8 -23v-726q0 -20 -18 -28.5t-34 6.5l-264 286v-177q0 -39 -21 -67.5t-53 -41.5q-22 -10 -45 -10h-395q-39 0 -67.5 21t-42.5 53q-9 22 -9 45z" />
+    <glyph glyph-name="b" unicode="b" horiz-adv-x="979" 
+d="M75 -45q-24 0 -41.5 17.5t-17.5 41.5v672q0 24 17.5 41.5t41.5 17.5h830q24 0 41 -17.5t17 -41.5v-672q0 -24 -17 -41.5t-41 -17.5h-830zM885 34v632h-790v-632h790zM174 167l142 185l97 -80l182 276l211 -218v-217h-632v54zM174 507q0 33 23.5 56.5t56 23.5t56 -23
+t23.5 -57q0 -33 -23.5 -56t-55.5 -23q-34 0 -57 23t-23 56z" />
+    <glyph glyph-name="c" unicode="c" horiz-adv-x="979" 
+d="M28 392q124 198 328 255q65 19 134 19q135 0 259 -72q121 -71 203 -202q11 -21 11 -42q0 -22 -11 -42q-126 -199 -328 -255q-64 -19 -134 -19q-135 0 -258 72q-121 71 -204 202q-12 19 -12 42q0 21 12 42zM297 538q-123 -62 -202 -188q105 -168 278 -220q55 -17 117 -17
+q120 0 224 64q101 61 171 173q-86 136 -218 197q55 -65 55 -151q0 -98 -69.5 -167.5t-167 -69.5t-167 69.5t-69.5 167.5q0 76 48 142zM332 396q0 -11 9 -20t20.5 -9t20.5 9t9 20q0 40 27.5 67.5t66.5 27.5q12 0 21 9t9 21t-8.5 20.5t-21.5 8.5q-50 0 -87 -26.5t-55 -67.5
+q-11 -26 -11 -60z" />
+    <glyph glyph-name="d" unicode="d" horiz-adv-x="979" 
+d="M490 666q40 0 107 -13l45 81q11 18 28 9l68 -39q18 -10 9 -28l-398 -710q-4 -11 -17 -11q-1 0 -10 2l-69 39q-17 11 -8 28l34 59q-153 70 -251 225q-12 19 -12 41t12 43q124 198 328 255q65 19 134 19zM297 540q-129 -69 -202 -190q87 -138 222 -199l29 54
+q-97 72 -97 191q0 76 48 144zM332 396q0 -11 9 -20t20.5 -9t20.5 9t9 20q0 40 27.5 67.5t66.5 27.5q12 0 21 9t9 21t-8.5 20.5t-21.5 8.5q-50 0 -87 -26.5t-55 -67.5q-11 -26 -11 -60zM538 116q113 14 200.5 76.5t146.5 157.5q-55 86 -135 145l39 71q99 -71 163 -174
+q11 -21 11 -43q0 -21 -11 -41q-82 -131 -202 -202q-118 -70 -257 -72zM572 176l146 262q4 -17 4 -42q0 -113 -90 -185q-30 -23 -60 -35z" />
+    <glyph glyph-name="e" unicode="e" horiz-adv-x="896" 
+d="M78 570l370 -356l372 356q22 26 48 0q26 -22 0 -48l-396 -392q-22 -22 -48 0l-396 392q-26 26 0 48q24 24 50 0z" />
+    <glyph glyph-name="f" unicode="f" horiz-adv-x="495" 
+d="M467 -20q25 -26 0 -48q-25 -26 -48 0l-392 394q-24 24 0 50l392 394q23 26 48 0q25 -22 0 -48l-358 -372z" />
+    <glyph glyph-name="g" unicode="g" horiz-adv-x="495" 
+d="M28 -20l358 370l-358 372q-26 26 0 48q26 26 48 0l392 -394q24 -26 0 -50l-392 -394q-22 -26 -48 0q-26 22 0 48z" />
+    <glyph glyph-name="h" unicode="h" horiz-adv-x="894" 
+d="M819 130l-372 358l-370 -358q-26 -23 -50 0q-24 24 0 50l396 390q25 26 48 0l396 -390q24 -26 0 -50q-25 -22 -48 0z" />
+    <glyph glyph-name="i" unicode="i" horiz-adv-x="730" 
+d="M227 398h280v-90h-280v90zM615 800q42 0 71 -29t29 -71v-700q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-40 0 -70 30t-30 70v700q0 41 29.5 70.5t70.5 29.5h500zM615 700h-500v-700h500v700zM505 504h-280v88h280v-88zM505 200v-88h-280v88h280z" />
+    <glyph glyph-name="j" unicode="j" horiz-adv-x="928" 
+d="M18 228l446 -112l447 112v-112l-447 -111l-446 111v112zM18 451l446 -112l447 112v-112l-447 -111l-446 111v112zM18 674l446 112l447 -112v-111l-447 -112l-446 112v111z" />
+    <glyph glyph-name="k" unicode="k" horiz-adv-x="735" 
+d="M322 310l60 118l227 224q23 -14 33 -24q12 -12 27 -36l-227 -224l-117 -60zM19 8l112 442l238 238q80 22 165 0l-206 -206l-150 -77l-33 -177l97 -98l177 32l77 150l209 210q11 -46 10.5 -83.5t-6.5 -60.5l-7 -26l-236 -237l-445 -113z" />
+    <glyph glyph-name="l" unicode="l" 
+d="M914 44l-95 -94l-229 229q-95 -65 -208 -65q-152 0 -260 108t-108 260t108 260t260 108t260 -108t108 -260q0 -114 -65 -208zM626 482q0 102 -72 174t-172 72q-102 0 -174 -72t-72 -174t72 -174q71 -71 174 -71q101 0 172 71q72 72 72 174z" />
+    <glyph glyph-name="m" unicode="m" 
+d="M834 850q33 0 56.5 -23.5t23.5 -55.5v-742q0 -32 -23.5 -55.5t-56.5 -23.5h-741q-33 0 -56 23.5t-23 55.5v742q0 32 23 55.5t56 23.5h741zM781 82q0 134 -51.5 251t-133.5 198.5t-199 134t-251 52.5v-122q146 0 263 -72t181 -183q69 -118 69 -259h122zM565 82
+q0 120 -59 215t-150 148q-97 57 -210 57v-122q122 0 210 -87q87 -85 87 -211h122zM305 162q0 33 -23.5 56.5t-56.5 23.5q-32 0 -55.5 -24t-23.5 -56.5t23.5 -56t55.5 -23.5t56 23.5t24 56.5z" />
+    <glyph glyph-name="n" unicode="n" horiz-adv-x="1030" 
+d="M915 750q42 0 71 -29t29 -71v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-800q-40 0 -70 30t-30 70v600q0 41 29.5 70.5t70.5 29.5h800zM915 650h-800v-600h800v600zM465 156h-250v90h250v-90zM465 306h-250v90h250v-90zM465 456h-250v90h250v-90zM811 226l4 -70h-250
+q0 70 6 70q84 22 84 66q0 16 -27 56t-27 88q0 110 90 110t90 -110q0 -48 -28 -88t-28 -56q0 -20 20.5 -35.5t43.5 -22.5z" />
+    <glyph glyph-name="o" unicode="o" 
+d="M834 850q33 0 56.5 -23.5t23.5 -55.5v-742q0 -32 -23.5 -55.5t-56.5 -23.5h-741q-33 0 -56 23.5t-23 55.5v742q0 32 23 55.5t56 23.5h741zM745 627l18 106q-39 13 -129 13q-72 0 -110 -52q-24 -31 -24 -107v-70h-71v-103h71v-360h134v360h107l8 103h-115v81q0 38 54 38
+q29 0 57 -9z" />
+    <glyph glyph-name="p" unicode="p" horiz-adv-x="929" 
+d="M916 425q-36 -41 -102 -41h-6q-34 -138 -160 -220q-128 -83 -274 -83q-117 0 -209 50.5t-151 133.5q67 -65 162 -65q102 0 172 75q-3 -1 -10 -1l-33 7q-21 11 -21 32q0 24 36 40q-6 -1 -17 -1q-65 0 -94 57q20 23 62 25q-89 22 -101 92q26 7 48 7h7q-85 47 -77 116
+q138 -52 232 -104q26 -15 68 -57q28 77 61 135q35 60 81 89q-1 -14 -14 -28q31 29 70 35q-2 -21 -48 -37q1 0 31 11t45 11q14 0 14 -10q0 -9 -16 -16t-37.5 -12.5t-25.5 -7.5q7 1 17 1q69 0 117.5 -53.5t62.5 -121.5q16 -6 32 -6q46 0 75 17q-11 -25 -38 -41t-61 -18
+q30 -14 74 -14q15 0 28 3z" />
+    <glyph glyph-name="q" unicode="q" 
+d="M834 850q33 0 56.5 -23.5t23.5 -55.5v-742q0 -32 -23.5 -55.5t-56.5 -23.5h-741q-33 0 -56 23.5t-23 55.5v742q0 32 23 55.5t56 23.5h741zM809 556v54h-109v110h-54v-110h-110v-54h110v-109h54v109h109zM292 413h9q0 -41 6 -42q9 -1 14 -18q-112 0 -169 -54
+q-34 -32 -34 -82q0 -70 55 -103.5t129 -33.5q83 0 144 41t61 121q0 33 -17.5 65t-39.5 50q-22 17 -40 34q-17 16 -17 26q0 9 14 23q9 9 30 27q19 14 31.5 44t12.5 64q0 67 -40 96q20 0 48 8q18 6 18 23q0 10 -20 10q-2 1 -47 1h-65q-65 0 -108 -13q-50 -17 -82 -54.5
+t-32 -93.5q0 -62 38.5 -100.5t100.5 -38.5zM385 549q0 -33 -14.5 -54.5t-42.5 -21.5q-38 0 -62 40q-23 42 -23 83q0 34 14.5 55.5t43.5 21.5q37 0 61 -41q23 -41 23 -83zM435 239q0 -40 -39 -64q-40 -24 -81 -24q-42 0 -77 21t-35 62q0 43 37 64.5t83 21.5q43 0 77 -21
+q35 -21 35 -60z" />
+    <glyph glyph-name="r" unicode="r" horiz-adv-x="793" 
+d="M673 468h-57v32q-35 -35 -67 -35q-41 0 -41 50v235h58v-216q0 -19 15.5 -19t34.5 22v213h57v-282zM379 757q35 0 58 -19.5t23 -53.5v-145q0 -37 -22.5 -57.5t-61.5 -20.5q-37 0 -60 21.5t-23 57.5v145q0 35 24.5 53.5t61.5 18.5zM376 709q-9 0 -16 -6t-7 -15v-154
+q0 -23 23 -23q25 0 25 23v154q0 8 -8 14.5t-17 6.5zM230 850h66l-49 -148q-1 -2 -11.5 -31t-14.5 -44v-159h-64v152q-1 8 -27 76l-51 154h66l41 -152h5zM775 54q-4 -43 -34.5 -70.5t-76.5 -29.5q-99 -4 -267 -4q-170 0 -267 4q-46 2 -77 29.5t-34 70.5q-5 87 -5 131t5 130
+q3 44 34 71.5t77 28.5q97 5 267 5t267 -5q46 -1 76.5 -28.5t34.5 -71.5q5 -86 5 -130t-5 -131zM580 103q0 -32 17.5 -51.5t49.5 -19.5q69 0 69 71v17h-47v-10v-10q0 -3 -0.5 -8.5t-2 -8t-3.5 -5.5t-6 -4.5t-9 -1.5q-20 0 -20 32v43h88v58q0 31 -17 49t-48 18t-51 -19
+t-20 -48v-102zM544 212q0 57 -44 57q-23 0 -42 -21v99h-47v-309h47v18q21 -20 44 -20q42 0 42 50v126zM365 38v228h-45v-173q-15 -17 -28 -17q-12 0 -12 15v175h-47v-192q0 -39 33 -39q26 0 54 28v-25h45zM234 302v45h-161v-45h54v-264h52v264h55zM669 182h-41v25
+q0 25 21 25q20 0 20 -25v-25zM497 210v-120q0 -18 -16 -18q-13 0 -23 9v143q9 9 20 9q19 0 19 -23z" />
+    <glyph glyph-name="s" unicode="s" horiz-adv-x="930" 
+d="M355 238v-68l-200 80v68zM355 446v-68l-200 80v68zM465 -100q-1 0 -5 1t-5 1l-10 2l-398 160q-32 12 -32 46v640q0 30 22 42q22 16 46 6l382 -154l382 154q24 10 46 -6q22 -12 22 -42v-640q0 -34 -32 -46l-398 -160q-2 0 -5 -1q-4 -1 -5 -1t-5 -1t-5 -1zM415 4v560
+l-320 128v-560zM835 132v560l-320 -128v-560zM775 318v-68l-200 -80v68zM775 526v-68l-200 -80v68z" />
+    <glyph glyph-name="t" unicode="t" horiz-adv-x="730" 
+d="M697 594q18 -8 18 -28v-562q0 -14 -12.5 -25t-27.5 -11q-46 0 -46 36v522q0 12 -12 18l-404 216q-31 10 -68 -10q-44 -20 -56 -44l408 -228q18 -8 18 -28v-550q0 -22 -18 -28q-5 -4 -16 -4q-15 0 -20 4q-13 9 -209 130l-205 128q-26 18 -26 34l-6 524q0 27 14 52
+q28 45 102 77t116 9z" />
+  </font>
+</defs></svg>

BIN
site/static/fonts/fontello-kleks-2.ttf


BIN
site/static/fonts/fontello-kleks-2.woff


+ 2 - 2
site/templates/base.html

@@ -56,9 +56,9 @@
       <ul>
         <li class="heading">Main Menu</li>
         {{{site.menu_html}}}
-        <li class="search-box">
+        <!-- <li class="search-box">
           <input type="text" placeholder="Search" data-track-click="Search Box">
-        </li>
+        </li> -->
       </ul>
     </nav>
 

+ 5 - 5
site/templates/collection.html

@@ -1,9 +1,7 @@
 {{#if collection.css}}<style>{{{collection.css}}}</style>{{/if}}
 
 <article class="collection">
-  <h2 class="title">
-    <a href="{{baseURL}}/collection/{{collection.slug}}">{{collection.name}}</a>&nbsp;<small>Collection</small>
-  </h2>
+  <h2 class="title"><a href="{{baseURL}}/collection/{{collection.slug}}"><i class="icon icon-collection"></i>{{collection.name}}</a>&nbsp;<small>Collection</small></h2>
 
   {{#if collection.photo}}
   <section class="photo">
@@ -20,8 +18,10 @@
   <ul class="list">
   {{#each docs}}
     <li>
-      <div class="date fresh-{{fresh}}">{{published_at_html}}</div>
-      <h3><a href="{{baseURL}}/{{type}}/{{slug}}">{{title}}</a></h3>
+      <!-- <div class="date fresh-{{fresh}}">{{published_at_html}}</div> -->
+      <h3>
+        <a href="{{baseURL}}/{{type}}/{{slug}}"><i class="icon icon-{{type}} fresh-{{fresh}}" title="Published on {{published_at_html}}"></i>{{title}}</a>
+      </h3>
     </li>
   {{/each}}
   </ul>

+ 3 - 3
site/templates/collections.html

@@ -1,12 +1,12 @@
 {{#if collections}}
 <section class="collections">
-  <h3><span class="label">Collections</span></h3>
+  <h3>The Collections</h3>
 
   <ul>
   {{#each collections}}
     <li class="collection">
-      <h4 class="name"><a href="{{baseURL}}/collection/{{slug}}">{{name}}</a></h4>
-      <div class="updated fresh-{{fresh}}" title="Updated on {{updated_at_html}}"></div>
+      <h4 class="name"><a href="{{baseURL}}/collection/{{slug}}"><i class="icon icon-collection fresh-{{fresh}}" title="Updated on {{updated_at_html}}"></i>{{name}}</a></h4>
+      <!-- <div class="updated fresh-{{fresh}}" title="Updated on {{updated_at_html}}"></div> -->
     </li>
   {{/each}}
   </ul>

+ 1 - 1
site/templates/doc.html

@@ -31,7 +31,7 @@
     <div class="published"><span class="label">Published</span> {{{doc.published_at_html}}}</div>
     <div class="updated"><span class="label">Updated</span> {{{doc.updated_at_html}}}</div>
     {{#each collections}}
-    <div class="collection"><a href="{{baseURL}}/collection/{{slug}}">{{name}}</a></div>
+    <div class="collection"><a href="{{baseURL}}/collection/{{slug}}"><i class="icon icon-collection"></i> {{name}}</a></div>
     {{/each}}
   </section>