N-archive/hacks-guide-minimal-mistakes-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'hotfix/style' into develop

Browse source
This commit is contained in:
Michael Rose 2013-06-21 10:03:08 -04:00
commit 963a41f149
11 changed files with 42 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
_config.yml
View file

@ -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

2
_includes/head.html
View file

@ -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 %}
<link rel="canonical" href="{{ canonical }}">
<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 -->
<meta name="HandheldFriendly" content="True">

2
_layouts/post-index.html
View file

@ -16,7 +16,7 @@
<div class="image-wrap">
<div class="headline-wrap">
<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 -->
<img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image">
</div><!-- /.image-wrap -->

29
assets/css/ie.css
View file

@ -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;

29
assets/css/main.css
View file

@ -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;

BIN
assets/img/background-dark.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.7 KiB

BIN
assets/img/background-light.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 54 KiB

9
assets/less/1382.less
View file

@ -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 {

7
assets/less/600.less
View file

@ -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);

5
assets/less/page.less
View file

@ -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,

2
assets/less/variables.less
View file

@ -4,7 +4,7 @@
@codefont: Monaco, Courier New, monospace;
// COLOR ====================================================
@bodycolor : #ebebeb;
@bodycolor : #fff;
@textcolor : #333332;
@basecolor : #343434;
@compcolor : spin(@basecolor, 180);