From 5aa9fc444a260f2cbed0ba2f62936deb85361b20 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Fri, 21 Jun 2013 10:01:44 -0400 Subject: [PATCH] Fix head-wrap position --- _layouts/post-index.html | 2 +- assets/css/ie.css | 11 ++++++++++- assets/css/main.css | 11 ++++++++++- assets/less/1382.less | 2 +- assets/less/600.less | 4 ++++ assets/less/page.less | 1 + 6 files changed, 27 insertions(+), 4 deletions(-) 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 e5e9e5e3..ffb39e40 100644 --- a/assets/css/ie.css +++ b/assets/css/ie.css @@ -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; @@ -1855,9 +1860,13 @@ html { margin-left: 0%; margin-right: 0%; } +.image-wrap .headline-wrap, .image-wrap:after { left: 25%; } +.image-wrap .headline-wrap { + margin-left: 0; +} #main article { display: inline; float: left; @@ -1946,7 +1955,7 @@ html { 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 accfa4a4..3cbc6449 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -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; @@ -2790,9 +2795,13 @@ img.mfp-img { margin-left: 0%; margin-right: 0%; } + .image-wrap .headline-wrap, .image-wrap:after { left: 25%; } + .image-wrap .headline-wrap { + margin-left: 0; + } #main article { display: inline; float: left; @@ -2887,7 +2896,7 @@ img.mfp-img { left: 33.333333333%; } .image-wrap .headline-wrap { - margin-left: 33.333333333333336%; + margin-left: 8.333333333333334%; } #main article { display: inline; diff --git a/assets/less/1382.less b/assets/less/1382.less index 42a15c6f..617b2aeb 100644 --- a/assets/less/1382.less +++ b/assets/less/1382.less @@ -15,7 +15,7 @@ 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 942b90b7..47fd85e8 100644 --- a/assets/less/600.less +++ b/assets/less/600.less @@ -16,9 +16,13 @@ html { .prefix(12,0); .suffix(12,0); } +.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 fdcae8af..753227b4 100644 --- a/assets/less/page.less +++ b/assets/less/page.less @@ -38,6 +38,7 @@ html { a { decoration: none; border-bottom: 0 solid transparent; + .transition(all .2s); } } }