diff --git a/_config.yml b/_config.yml index 7ec08cc..7a3d452 100644 --- a/_config.yml +++ b/_config.yml @@ -1,12 +1,13 @@ title: So Simple Theme description: A simple and clean responsive Jekyll theme for words and photos. +logo: site-logo.png #Comment out url when working locally to resolve base urls correctly #url: http://mmistakes.github.io/so-simple-theme # Owner/author information owner: name: Michael Rose - avatar: site-logo.png + avatar: michael-rose-sketch.jpg email: michael@mademistakes.com # Social networking links used in footer. Update and remove as you like. twitter: "mmistakes" diff --git a/_includes/navigation.html b/_includes/navigation.html index b3eb9b0..b5cd4cc 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -11,7 +11,7 @@
- +

{{ site.title }}

{{ site.description }}

diff --git a/_layouts/page.html b/_layouts/page.html index ac93c40..b20e163 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -16,7 +16,7 @@
{% if page.image.feature %}{{ page.title }}{% endif %}
-
+

{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}

{% endif %}
diff --git a/_layouts/post.html b/_layouts/post.html index 6345b0a..f821182 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -16,13 +16,14 @@
{% if page.image.feature %}{{ page.title }}{% endif %}
-
+

{% if page.headline %}{{ page.headline }}{% else %}{{ page.title }}

{% endif %}
diff --git a/assets/css/main.css b/assets/css/main.css index 8e6f38c..b072dfc 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -2560,17 +2560,26 @@ body { -moz-animation-delay: .05s; -o-animation-delay: .05s; animation-delay: .05s; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } @media only screen and (min-width: 48em) { .site-logo img { width: 150px; height: 150px; + -webkit-border-radius: 150px; + -moz-border-radius: 150px; + border-radius: 150px; } } @media only screen and (min-width: 62.5em) { .site-logo img { width: 200px; height: 200px; + -webkit-border-radius: 200px; + -moz-border-radius: 200px; + border-radius: 200px; } } .site-title { @@ -2638,6 +2647,19 @@ body { .entry-feature-image { margin: 40px 0; } +.entry-header { + max-width: 640px; + width: 100%; + margin-right: auto; + margin-left: auto; +} +@media only screen and (min-width: 62.5em) { + .entry-header { + max-width: 100%; + margin-right: 0; + margin-left: 0; + } +} .entry-tags { display: block; margin-top: 2em; @@ -2707,6 +2729,10 @@ span + .entry-title { } } .entry-meta { + max-width: 640px; + width: 100%; + margin-right: auto; + margin-left: auto; display: block; text-transform: uppercase; font-size: 14px; @@ -2735,6 +2761,30 @@ span + .entry-title { border-bottom: 1px solid rgba(0, 0, 0, 0.1); } } +.author-photo { + display: none; +} +@media only screen and (min-width: 62.5em) { + .author-photo { + display: block; + width: 150px; + height: 150px; + margin-bottom: 10px; + -webkit-border-radius: 150px; + -moz-border-radius: 150px; + border-radius: 150px; + *zoom: 1; + } + .author-photo:before, + .author-photo:after { + display: table; + content: ""; + line-height: 0; + } + .author-photo:after { + clear: both; + } +} .entry-content { max-width: 640px; width: 100%; diff --git a/assets/less/page.less b/assets/less/page.less index 532df51..57c8676 100644 --- a/assets/less/page.less +++ b/assets/less/page.less @@ -116,13 +116,16 @@ body { -moz-animation-delay: .05s; -o-animation-delay: .05s; animation-delay: .05s; + .rounded(100px); @media @medium { width: 150px; height: 150px; + .rounded(150px); } @media @large { width: 200px; height: 200px; + .rounded(200px); } } } @@ -171,6 +174,17 @@ body { .entry-feature-image { margin: 40px 0; } +.entry-header { + max-width: 640px; + width: 100%; + margin-right: auto; + margin-left: auto; + @media @large { + max-width: 100%; + margin-right: 0; + margin-left: 0; + } +} .entry-tags { display: block; margin-top: 2em; @@ -215,6 +229,10 @@ span + .entry-title { } } .entry-meta { + max-width: 640px; + width: 100%; + margin-right: auto; + margin-left: auto; display: block; text-transform: uppercase; .font-rem(14); @@ -236,6 +254,17 @@ span + .entry-title { } } } +.author-photo { + display: none; + @media @large { + display: block; + width: 150px; + height: 150px; + margin-bottom: 10px; + .rounded(150px); + .clearfix(); + } +} .entry-content { max-width: 640px; width: 100%; diff --git a/images/michael-rose-sketch.jpg b/images/michael-rose-sketch.jpg new file mode 100644 index 0000000..53d0a6e Binary files /dev/null and b/images/michael-rose-sketch.jpg differ