Merge branch 'hotfix/style' into develop
This commit is contained in:
commit
963a41f149
11 changed files with 42 additions and 53 deletions
10
_config.yml
10
_config.yml
|
@ -12,14 +12,14 @@ owner:
|
||||||
email: michael@mademistakes.com
|
email: michael@mademistakes.com
|
||||||
# Social networking links are used in author-bio sidebar. Update and remove as you like.
|
# Social networking links are used in author-bio sidebar. Update and remove as you like.
|
||||||
twitter: "mmistakes"
|
twitter: "mmistakes"
|
||||||
facebook: "michaelrose"
|
facebook:
|
||||||
github: "mmistakes"
|
github: "mmistakes"
|
||||||
linkedin: "michaelrose"
|
linkedin:
|
||||||
instagram: "mmistakes"
|
instagram: "mmistakes"
|
||||||
lastfm: "anotherjpeg"
|
lastfm:
|
||||||
tumblr: "mademistakes"
|
tumblr:
|
||||||
# For Google Authorship https://plus.google.com/authorship
|
# 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
|
# Analytics and webmaster tools stuff goes here
|
||||||
google_analytics: UA-41189495-1
|
google_analytics: UA-41189495-1
|
||||||
|
|
|
@ -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 %}
|
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
|
||||||
<link rel="canonical" href="{{ canonical }}">
|
<link rel="canonical" href="{{ canonical }}">
|
||||||
<link href="{{ site.url }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
|
<link href="{{ site.url }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
|
||||||
<link rel="author" href="{{ site.owner.google_plus }}">
|
<link rel="author" href="{{ site.owner.google_plus }}?rel=author">
|
||||||
|
|
||||||
<!-- http://t.co/dKP3o1e -->
|
<!-- http://t.co/dKP3o1e -->
|
||||||
<meta name="HandheldFriendly" content="True">
|
<meta name="HandheldFriendly" content="True">
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
<div class="image-wrap">
|
<div class="image-wrap">
|
||||||
<div class="headline-wrap">
|
<div class="headline-wrap">
|
||||||
<h1>{{ page.title }}</h1>
|
<h1>{{ page.title }}</h1>
|
||||||
{% if page.tagline %}<h2>{{ page.tagline }}</h2>{% endif %}
|
{% if page.tagline %}<h2 class="hidden-phone">{{ page.tagline }}</h2>{% endif %}
|
||||||
</div><!--/ .headline-wrap -->
|
</div><!--/ .headline-wrap -->
|
||||||
<img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image">
|
<img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image">
|
||||||
</div><!-- /.image-wrap -->
|
</div><!-- /.image-wrap -->
|
||||||
|
|
|
@ -1380,7 +1380,7 @@ select:focus {
|
||||||
}
|
}
|
||||||
/* Page level layout styles */
|
/* Page level layout styles */
|
||||||
html {
|
html {
|
||||||
background: #ebebeb url(../img/background-light.jpg);
|
background-color: #ffffff;
|
||||||
font-family: 'PT Serif', serif;
|
font-family: 'PT Serif', serif;
|
||||||
font-color: #333332;
|
font-color: #333332;
|
||||||
font-size: 90%;
|
font-size: 90%;
|
||||||
|
@ -1426,6 +1426,11 @@ html {
|
||||||
.top-navigation li a {
|
.top-navigation li a {
|
||||||
decoration: none;
|
decoration: none;
|
||||||
border-bottom: 0 solid transparent;
|
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 {
|
#main {
|
||||||
counter-reset: captions;
|
counter-reset: captions;
|
||||||
|
@ -1493,7 +1498,7 @@ html {
|
||||||
width: 0;
|
width: 0;
|
||||||
height: 0;
|
height: 0;
|
||||||
border: 20px solid transparent;
|
border: 20px solid transparent;
|
||||||
border-bottom-color: #ebebeb;
|
border-bottom-color: #ffffff;
|
||||||
}
|
}
|
||||||
.image-wrap img {
|
.image-wrap img {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -1717,7 +1722,7 @@ html {
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
padding-top: 2em;
|
padding-top: 2em;
|
||||||
padding-bottom: 3em;
|
padding-bottom: 3em;
|
||||||
background: #000000 url(../img/background-dark.png);
|
background-color: #000000;
|
||||||
}
|
}
|
||||||
.footer-wrap:before,
|
.footer-wrap:before,
|
||||||
.footer-wrap:after {
|
.footer-wrap:after {
|
||||||
|
@ -1855,12 +1860,13 @@ html {
|
||||||
margin-left: 0%;
|
margin-left: 0%;
|
||||||
margin-right: 0%;
|
margin-right: 0%;
|
||||||
}
|
}
|
||||||
.image-wrap .headline-wrap {
|
.image-wrap .headline-wrap,
|
||||||
margin-left: 25%;
|
|
||||||
}
|
|
||||||
.image-wrap:after {
|
.image-wrap:after {
|
||||||
left: 25%;
|
left: 25%;
|
||||||
}
|
}
|
||||||
|
.image-wrap .headline-wrap {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
#main article {
|
#main article {
|
||||||
display: inline;
|
display: inline;
|
||||||
float: left;
|
float: left;
|
||||||
|
@ -1945,20 +1951,11 @@ html {
|
||||||
float: left;
|
float: left;
|
||||||
width: 66.66666666666667%;
|
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 {
|
.image-wrap:after {
|
||||||
left: 33.333333333%;
|
left: 33.333333333%;
|
||||||
}
|
}
|
||||||
.image-wrap .headline-wrap {
|
.image-wrap .headline-wrap {
|
||||||
margin-left: 33.333333333333336%;
|
margin-left: 8.333333333333334%;
|
||||||
}
|
}
|
||||||
#main article {
|
#main article {
|
||||||
display: inline;
|
display: inline;
|
||||||
|
|
|
@ -1737,7 +1737,7 @@ select:focus {
|
||||||
}
|
}
|
||||||
/* Page level layout styles ================================ */
|
/* Page level layout styles ================================ */
|
||||||
html {
|
html {
|
||||||
background: #ebebeb url(../img/background-light.jpg);
|
background-color: #ffffff;
|
||||||
font-family: 'PT Serif', serif;
|
font-family: 'PT Serif', serif;
|
||||||
font-color: #333332;
|
font-color: #333332;
|
||||||
font-size: 90%;
|
font-size: 90%;
|
||||||
|
@ -1783,6 +1783,11 @@ html {
|
||||||
.top-navigation li a {
|
.top-navigation li a {
|
||||||
decoration: none;
|
decoration: none;
|
||||||
border-bottom: 0 solid transparent;
|
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 {
|
#main {
|
||||||
counter-reset: captions;
|
counter-reset: captions;
|
||||||
|
@ -1850,7 +1855,7 @@ html {
|
||||||
width: 0;
|
width: 0;
|
||||||
height: 0;
|
height: 0;
|
||||||
border: 20px solid transparent;
|
border: 20px solid transparent;
|
||||||
border-bottom-color: #ebebeb;
|
border-bottom-color: #ffffff;
|
||||||
}
|
}
|
||||||
.image-wrap img {
|
.image-wrap img {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -2074,7 +2079,7 @@ html {
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
padding-top: 2em;
|
padding-top: 2em;
|
||||||
padding-bottom: 3em;
|
padding-bottom: 3em;
|
||||||
background: #000000 url(../img/background-dark.png);
|
background-color: #000000;
|
||||||
}
|
}
|
||||||
.footer-wrap:before,
|
.footer-wrap:before,
|
||||||
.footer-wrap:after {
|
.footer-wrap:after {
|
||||||
|
@ -2790,12 +2795,13 @@ img.mfp-img {
|
||||||
margin-left: 0%;
|
margin-left: 0%;
|
||||||
margin-right: 0%;
|
margin-right: 0%;
|
||||||
}
|
}
|
||||||
.image-wrap .headline-wrap {
|
.image-wrap .headline-wrap,
|
||||||
margin-left: 25%;
|
|
||||||
}
|
|
||||||
.image-wrap:after {
|
.image-wrap:after {
|
||||||
left: 25%;
|
left: 25%;
|
||||||
}
|
}
|
||||||
|
.image-wrap .headline-wrap {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
#main article {
|
#main article {
|
||||||
display: inline;
|
display: inline;
|
||||||
float: left;
|
float: left;
|
||||||
|
@ -2886,20 +2892,11 @@ img.mfp-img {
|
||||||
float: left;
|
float: left;
|
||||||
width: 66.66666666666667%;
|
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 {
|
.image-wrap:after {
|
||||||
left: 33.333333333%;
|
left: 33.333333333%;
|
||||||
}
|
}
|
||||||
.image-wrap .headline-wrap {
|
.image-wrap .headline-wrap {
|
||||||
margin-left: 33.333333333333336%;
|
margin-left: 8.333333333333334%;
|
||||||
}
|
}
|
||||||
#main article {
|
#main article {
|
||||||
display: inline;
|
display: inline;
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 9.7 KiB |
Binary file not shown.
Before Width: | Height: | Size: 54 KiB |
|
@ -11,18 +11,11 @@
|
||||||
.grid(12,8);
|
.grid(12,8);
|
||||||
}
|
}
|
||||||
.image-wrap {
|
.image-wrap {
|
||||||
img {
|
|
||||||
.grid(12,8);
|
|
||||||
.prefix(12,2);
|
|
||||||
.suffix(12,2);
|
|
||||||
margin-top: 1em;
|
|
||||||
margin-bottom: 2em;
|
|
||||||
}
|
|
||||||
&:after {
|
&:after {
|
||||||
left: 33.333333333%;
|
left: 33.333333333%;
|
||||||
}
|
}
|
||||||
.headline-wrap {
|
.headline-wrap {
|
||||||
.prefix(12,4);
|
.prefix(12,1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#main article {
|
#main article {
|
||||||
|
|
|
@ -16,12 +16,13 @@ html {
|
||||||
.prefix(12,0);
|
.prefix(12,0);
|
||||||
.suffix(12,0);
|
.suffix(12,0);
|
||||||
}
|
}
|
||||||
.image-wrap .headline-wrap {
|
.image-wrap .headline-wrap,
|
||||||
.prefix(12,3);
|
|
||||||
}
|
|
||||||
.image-wrap:after {
|
.image-wrap:after {
|
||||||
left: 25%;
|
left: 25%;
|
||||||
}
|
}
|
||||||
|
.image-wrap .headline-wrap {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
#main article {
|
#main article {
|
||||||
.grid(12,6);
|
.grid(12,6);
|
||||||
.prefix(12,0);
|
.prefix(12,0);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
html {
|
html {
|
||||||
background: @bodycolor url(../img/background-light.jpg);
|
background-color: @bodycolor;
|
||||||
font-family: @basefont;
|
font-family: @basefont;
|
||||||
font-color: @textcolor;
|
font-color: @textcolor;
|
||||||
font-size: 90%;
|
font-size: 90%;
|
||||||
|
@ -38,6 +38,7 @@ html {
|
||||||
a {
|
a {
|
||||||
decoration: none;
|
decoration: none;
|
||||||
border-bottom: 0 solid transparent;
|
border-bottom: 0 solid transparent;
|
||||||
|
.transition(all .2s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -259,7 +260,7 @@ html {
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
padding-top: 2em;
|
padding-top: 2em;
|
||||||
padding-bottom: 3em;
|
padding-bottom: 3em;
|
||||||
background: @black url(../img/background-dark.png);
|
background-color: @black;
|
||||||
a,
|
a,
|
||||||
a:active,
|
a:active,
|
||||||
a:visited,
|
a:visited,
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
@codefont: Monaco, Courier New, monospace;
|
@codefont: Monaco, Courier New, monospace;
|
||||||
|
|
||||||
// COLOR ====================================================
|
// COLOR ====================================================
|
||||||
@bodycolor : #ebebeb;
|
@bodycolor : #fff;
|
||||||
@textcolor : #333332;
|
@textcolor : #333332;
|
||||||
@basecolor : #343434;
|
@basecolor : #343434;
|
||||||
@compcolor : spin(@basecolor, 180);
|
@compcolor : spin(@basecolor, 180);
|
||||||
|
|
Loading…
Reference in a new issue