diff --git a/_config.yml b/_config.yml index 7e49b3ff..9a9a9f29 100644 --- a/_config.yml +++ b/_config.yml @@ -12,14 +12,14 @@ owner: email: michael@mademistakes.com # Social networking links are used in author-bio sidebar. Update and remove as you like. twitter: "mmistakes" - facebook: "michaelrose" + facebook: github: "mmistakes" - linkedin: "michaelrose" + linkedin: instagram: "mmistakes" - lastfm: "anotherjpeg" - tumblr: "mademistakes" + lastfm: + tumblr: # For Google Authorship https://plus.google.com/authorship - google_plus: "https://plus.google.com/118238196859537351707/posts" + google_plus: "http://plus.google.com/118238196859537351707" # Analytics and webmaster tools stuff goes here google_analytics: UA-41189495-1 diff --git a/_includes/head.html b/_includes/head.html index 38586ade..00509d58 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -28,7 +28,7 @@ {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} - + diff --git a/_layouts/post-index.html b/_layouts/post-index.html index ab0a55d1..6ed5c8b6 100644 --- a/_layouts/post-index.html +++ b/_layouts/post-index.html @@ -16,7 +16,7 @@

{{ page.title }}

- {% if page.tagline %}

{{ page.tagline }}

{% endif %} + {% if page.tagline %}

{{ page.tagline }}

{% endif %}
{{ page.title }} feature image
diff --git a/assets/css/ie.css b/assets/css/ie.css index c2876f9a..ffb39e40 100644 --- a/assets/css/ie.css +++ b/assets/css/ie.css @@ -1380,7 +1380,7 @@ select:focus { } /* Page level layout styles */ html { - background: #ebebeb url(../img/background-light.jpg); + background-color: #ffffff; font-family: 'PT Serif', serif; font-color: #333332; font-size: 90%; @@ -1426,6 +1426,11 @@ html { .top-navigation li a { decoration: none; border-bottom: 0 solid transparent; + -webkit-transition: all 0.2s; + -moz-transition: all 0.2s; + -ms-transition: all 0.2s; + -o-transition: all 0.2s; + transition: all 0.2s; } #main { counter-reset: captions; @@ -1493,7 +1498,7 @@ html { width: 0; height: 0; border: 20px solid transparent; - border-bottom-color: #ebebeb; + border-bottom-color: #ffffff; } .image-wrap img { width: 100%; @@ -1717,7 +1722,7 @@ html { margin-top: 1em; padding-top: 2em; padding-bottom: 3em; - background: #000000 url(../img/background-dark.png); + background-color: #000000; } .footer-wrap:before, .footer-wrap:after { @@ -1855,12 +1860,13 @@ html { margin-left: 0%; margin-right: 0%; } -.image-wrap .headline-wrap { - margin-left: 25%; -} +.image-wrap .headline-wrap, .image-wrap:after { left: 25%; } +.image-wrap .headline-wrap { + margin-left: 0; +} #main article { display: inline; float: left; @@ -1945,20 +1951,11 @@ html { float: left; width: 66.66666666666667%; } -.image-wrap img { - display: inline; - float: left; - width: 66.66666666666667%; - margin-left: 16.666666666666668%; - margin-right: 16.666666666666668%; - margin-top: 1em; - margin-bottom: 2em; -} .image-wrap:after { left: 33.333333333%; } .image-wrap .headline-wrap { - margin-left: 33.333333333333336%; + margin-left: 8.333333333333334%; } #main article { display: inline; diff --git a/assets/css/main.css b/assets/css/main.css index 2de16435..3cbc6449 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1737,7 +1737,7 @@ select:focus { } /* Page level layout styles ================================ */ html { - background: #ebebeb url(../img/background-light.jpg); + background-color: #ffffff; font-family: 'PT Serif', serif; font-color: #333332; font-size: 90%; @@ -1783,6 +1783,11 @@ html { .top-navigation li a { decoration: none; border-bottom: 0 solid transparent; + -webkit-transition: all 0.2s; + -moz-transition: all 0.2s; + -ms-transition: all 0.2s; + -o-transition: all 0.2s; + transition: all 0.2s; } #main { counter-reset: captions; @@ -1850,7 +1855,7 @@ html { width: 0; height: 0; border: 20px solid transparent; - border-bottom-color: #ebebeb; + border-bottom-color: #ffffff; } .image-wrap img { width: 100%; @@ -2074,7 +2079,7 @@ html { margin-top: 1em; padding-top: 2em; padding-bottom: 3em; - background: #000000 url(../img/background-dark.png); + background-color: #000000; } .footer-wrap:before, .footer-wrap:after { @@ -2790,12 +2795,13 @@ img.mfp-img { margin-left: 0%; margin-right: 0%; } - .image-wrap .headline-wrap { - margin-left: 25%; - } + .image-wrap .headline-wrap, .image-wrap:after { left: 25%; } + .image-wrap .headline-wrap { + margin-left: 0; + } #main article { display: inline; float: left; @@ -2886,20 +2892,11 @@ img.mfp-img { float: left; width: 66.66666666666667%; } - .image-wrap img { - display: inline; - float: left; - width: 66.66666666666667%; - margin-left: 16.666666666666668%; - margin-right: 16.666666666666668%; - margin-top: 1em; - margin-bottom: 2em; - } .image-wrap:after { left: 33.333333333%; } .image-wrap .headline-wrap { - margin-left: 33.333333333333336%; + margin-left: 8.333333333333334%; } #main article { display: inline; diff --git a/assets/img/background-dark.png b/assets/img/background-dark.png deleted file mode 100644 index 2fd96e8f..00000000 Binary files a/assets/img/background-dark.png and /dev/null differ diff --git a/assets/img/background-light.jpg b/assets/img/background-light.jpg deleted file mode 100644 index 2d09b17d..00000000 Binary files a/assets/img/background-light.jpg and /dev/null differ diff --git a/assets/less/1382.less b/assets/less/1382.less index 7bca50a8..617b2aeb 100644 --- a/assets/less/1382.less +++ b/assets/less/1382.less @@ -11,18 +11,11 @@ .grid(12,8); } .image-wrap { - img { - .grid(12,8); - .prefix(12,2); - .suffix(12,2); - margin-top: 1em; - margin-bottom: 2em; - } &:after { left: 33.333333333%; } .headline-wrap { - .prefix(12,4); + .prefix(12,1); } } #main article { diff --git a/assets/less/600.less b/assets/less/600.less index 1c666336..47fd85e8 100644 --- a/assets/less/600.less +++ b/assets/less/600.less @@ -16,12 +16,13 @@ html { .prefix(12,0); .suffix(12,0); } -.image-wrap .headline-wrap { - .prefix(12,3); -} +.image-wrap .headline-wrap, .image-wrap:after { left: 25%; } +.image-wrap .headline-wrap { + margin-left: 0; +} #main article { .grid(12,6); .prefix(12,0); diff --git a/assets/less/page.less b/assets/less/page.less index 59c49e7f..753227b4 100644 --- a/assets/less/page.less +++ b/assets/less/page.less @@ -1,5 +1,5 @@ html { - background: @bodycolor url(../img/background-light.jpg); + background-color: @bodycolor; font-family: @basefont; font-color: @textcolor; font-size: 90%; @@ -38,6 +38,7 @@ html { a { decoration: none; border-bottom: 0 solid transparent; + .transition(all .2s); } } } @@ -259,7 +260,7 @@ html { margin-top: 1em; padding-top: 2em; padding-bottom: 3em; - background: @black url(../img/background-dark.png); + background-color: @black; a, a:active, a:visited, diff --git a/assets/less/variables.less b/assets/less/variables.less index b22c39a2..f81a7d5d 100644 --- a/assets/less/variables.less +++ b/assets/less/variables.less @@ -4,7 +4,7 @@ @codefont: Monaco, Courier New, monospace; // COLOR ==================================================== -@bodycolor : #ebebeb; +@bodycolor : #fff; @textcolor : #333332; @basecolor : #343434; @compcolor : spin(@basecolor, 180);