diff --git a/_layouts/default.html b/_layouts/default.html index 876def0..7f66663 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -22,8 +22,10 @@ {{ content }} + {% if page.footer != "hidden" %} + {% endif %} \ No newline at end of file diff --git a/_layouts/pun.html b/_layouts/pun.html index 7e55d87..f938506 100644 --- a/_layouts/pun.html +++ b/_layouts/pun.html @@ -1,4 +1,15 @@ --- layout: default +footer: hidden --- -{{content}} \ No newline at end of file +
+
+ {{content}} +
+
+ + Facebook + Twitter + +
+
\ No newline at end of file diff --git a/_posts/14-08-23-theese-jokes-are-too-cheesy.md b/_posts/14-08-23-theese-jokes-are-too-cheesy.md index 58762b0..597307b 100644 --- a/_posts/14-08-23-theese-jokes-are-too-cheesy.md +++ b/_posts/14-08-23-theese-jokes-are-too-cheesy.md @@ -1,4 +1,6 @@ --- layout: pun +color: "#fff" +background-color: "#2ecc71" --- Theese jokes are too cheesy \ No newline at end of file diff --git a/styles/icomoon/demo.html b/styles/icomoon/demo.html index 3f16369..542a617 100755 --- a/styles/icomoon/demo.html +++ b/styles/icomoon/demo.html @@ -9,10 +9,36 @@
-

Font Name: icomoon (Glyphs: 3)

+

Font Name: icomoon (Glyphs: 5)

Grid Size: 16

+
+
+ icon-arrow-right +
+
+ + +
+
+ liga: + +
+
+
+
+ icon-arrow-left +
+
+ + +
+
+ liga: + +
+
icon-googleplus diff --git a/styles/icomoon/fonts/icomoon.eot b/styles/icomoon/fonts/icomoon.eot index 099de2e..0739264 100755 Binary files a/styles/icomoon/fonts/icomoon.eot and b/styles/icomoon/fonts/icomoon.eot differ diff --git a/styles/icomoon/fonts/icomoon.svg b/styles/icomoon/fonts/icomoon.svg index 4017cbf..f17fd88 100755 --- a/styles/icomoon/fonts/icomoon.svg +++ b/styles/icomoon/fonts/icomoon.svg @@ -10,4 +10,6 @@ + + \ No newline at end of file diff --git a/styles/icomoon/fonts/icomoon.ttf b/styles/icomoon/fonts/icomoon.ttf index 9c1d955..3bc65c5 100755 Binary files a/styles/icomoon/fonts/icomoon.ttf and b/styles/icomoon/fonts/icomoon.ttf differ diff --git a/styles/icomoon/fonts/icomoon.woff b/styles/icomoon/fonts/icomoon.woff index f4281fe..5c2b921 100755 Binary files a/styles/icomoon/fonts/icomoon.woff and b/styles/icomoon/fonts/icomoon.woff differ diff --git a/styles/icomoon/selection.json b/styles/icomoon/selection.json index 482685a..117dda2 100755 --- a/styles/icomoon/selection.json +++ b/styles/icomoon/selection.json @@ -1,6 +1,52 @@ { "IcoMoonType": "selection", "icons": [ + { + "icon": { + "paths": [ + "M621.254 877.254l320-320c24.994-24.992 24.994-65.516 0-90.51l-320-320c-24.994-24.992-65.516-24.992-90.51 0-24.994 24.994-24.994 65.516 0 90.51l210.746 210.746h-613.49c-35.346 0-64 28.654-64 64s28.654 64 64 64h613.49l-210.746 210.746c-12.496 12.496-18.744 28.876-18.744 45.254s6.248 32.758 18.744 45.254c24.994 24.994 65.516 24.994 90.51 0z" + ], + "tags": [ + "arrow-right", + "right", + "next" + ], + "grid": 16 + }, + "properties": { + "id": 298, + "order": 8, + "prevSize": 32, + "code": 58883, + "name": "arrow-right", + "ligatures": "" + }, + "setIdx": 0, + "iconIdx": 298 + }, + { + "icon": { + "paths": [ + "M402.746 146.746l-320 320c-24.994 24.992-24.994 65.516 0 90.508l320 320c24.994 24.992 65.516 24.992 90.51 0 24.996-24.992 24.996-65.516 0-90.508l-210.748-210.746h613.492c35.346 0 64-28.652 64-64 0-35.346-28.654-64-64-64h-613.492l210.746-210.746c12.496-12.496 18.746-28.876 18.746-45.254s-6.248-32.758-18.744-45.254c-24.996-24.994-65.516-24.994-90.51 0z" + ], + "tags": [ + "arrow-left", + "left", + "previous" + ], + "grid": 16 + }, + "properties": { + "id": 302, + "order": 7, + "prevSize": 32, + "code": 58884, + "name": "arrow-left", + "ligatures": "" + }, + "setIdx": 0, + "iconIdx": 302 + }, { "icon": { "paths": [ diff --git a/styles/icomoon/style.css b/styles/icomoon/style.css index 86c871a..56193c2 100755 --- a/styles/icomoon/style.css +++ b/styles/icomoon/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src:url('fonts/icomoon.eot?-og36f0'); - src:url('fonts/icomoon.eot?#iefix-og36f0') format('embedded-opentype'), - url('fonts/icomoon.woff?-og36f0') format('woff'), - url('fonts/icomoon.ttf?-og36f0') format('truetype'), - url('fonts/icomoon.svg?-og36f0#icomoon') format('svg'); + src:url('fonts/icomoon.eot?emf6qi'); + src:url('fonts/icomoon.eot?#iefixemf6qi') format('embedded-opentype'), + url('fonts/icomoon.woff?emf6qi') format('woff'), + url('fonts/icomoon.ttf?emf6qi') format('truetype'), + url('fonts/icomoon.svg?emf6qi#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -23,6 +23,12 @@ -moz-osx-font-smoothing: grayscale; } +.icon-arrow-right:before { + content: "\e603"; +} +.icon-arrow-left:before { + content: "\e604"; +} .icon-googleplus:before { content: "\e600"; } diff --git a/styles/main.css b/styles/main.css index 7d387b5..ab511f2 100644 --- a/styles/main.css +++ b/styles/main.css @@ -20,12 +20,22 @@ body { main { margin: 0 auto; - max-width: 720px; + max-width: 920px; padding: 20px; min-width: 240px; + + padding: 6vw; + /*padding-bottom: 10vh;*/ + font-size: calc(0.8vw + 12px); + line-height: 1.4em; + padding-top: 100px; +} +main.pun { + padding: 0; + margin: 0; } -a { +a:not(.btn) { color: inherit; text-decoration: inherit; box-shadow: 0 10px 0 -8px #444;/* @@ -40,36 +50,81 @@ a:hover, a:focus { } .btn { color: #444; - line-height: 1em; + line-height: 1.2em; color: inherit; text-decoration: none; - display: inline-block;/* - margin: 1em;*/ + display: inline-block; border-radius: 4px; background-color: #fff; - box-shadow: 0 0 0 0 #444 inset, 0.3em 0.2em 0 0 #bbb; - border: 0.2em solid #444; - padding: 0.8em; + box-shadow: 0 0 0 0 #444 inset; + border: 2px solid #444; + padding: 0.3em; text-align: center; - transition: 0.25s box-shadow, 0.25s -webkit-transform; -} -.btn { - padding: 0.7em; + transition: 0.25s box-shadow, 0.25s color; } .btn:hover { - box-shadow: 0 4em 0 0 #444 inset, 0em 0em 0 0 #bbb; - -webkit-transform: translate(0.3em, 0.2em); + box-shadow: 0 2em 0 0 #444 inset; color: #fff; } .btn.disabled { opacity: 0.8; } .btn.disabled:hover { - box-shadow: 0 0 0 0 #444 inset, 0.3em 0.2em 0 0 #bbb; - -webkit-transform: translate(0, 0); + box-shadow: 0 0 0 0 #444 inset; color: #444; } +.share { + padding: 20px; + text-align: center;/* + position: absolute; + bottom: 5vh; + width: 80vw; + left: 10vw;*/ +} +.share .btn { + font-size: 1.2em; + font-family: "Shadows Into Light Two", sans-serif; +} +.share .btn * { + vertical-align: bottom; +} +.share .btn i { + margin-right: 0.3em; +} +.btn[href="#facebook"] { + border-color: #3b5998 !important; + color: #3b5998; + box-shadow: 0 0 0 0 #3b5998 inset; +} +.btn[href="#facebook"]:hover { + box-shadow: 0 2em 0 0 #3b5998 inset; + color: #fff; +} +.btn[href="#twitter"] { + border-color: #00aced !important; + color: #00aced; + box-shadow: 0 0 0 0 #00aced inset; +} +.btn[href="#twitter"]:hover { + box-shadow: 0 2em 0 0 #00aced inset; + color: #fff; +} +.previous { + float: left; +} +.next { + float: right; +} + +.puncontent { + font-size: 50px; + line-height: 1.2em; + padding: 2em 1em; + min-height: 80vh; + padding-top: 3em; +} + h1, h2, h3, h4, h5, h6 { font-weight: 300; line-height: 1.4em; @@ -179,7 +234,7 @@ th { background-repeat: no-repeat; font-size: 24px; - font-family: "Shadows Into Light Two"; + font-family: "Shadows Into Light Two", sans-serif; } .site-header * { padding: 0; @@ -274,14 +329,6 @@ th { -main { - padding: 10vh 6vw; - padding-bottom: 20vh; - font-size: calc(0.8vw + 12px); - line-height: 1.4em; - padding-top: 100px; -} - footer {