From f4a1a39946626864090c0a73cd4782d57f679923 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Tue, 19 Jan 2016 16:08:35 +0100 Subject: [PATCH] Render home button with text similar to the menu button --- config.rb | 1 - source/author.html.haml | 4 +--- source/fonts/icons.config.json | 6 ++++++ source/fonts/icons.eot | Bin 6984 -> 7088 bytes source/fonts/icons.svg | 1 + source/fonts/icons.ttf | Bin 6828 -> 6932 bytes source/fonts/icons.woff | Bin 4288 -> 4352 bytes source/images/home.svg | 9 --------- source/layouts/page.haml | 4 +--- source/layouts/post.haml | 4 +--- source/stylesheets/_icons.css.scss | 11 ++++++----- source/stylesheets/application.css.scss | 5 +++++ source/tag.html.haml | 4 +--- 13 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 source/images/home.svg diff --git a/config.rb b/config.rb index 6ffcad8..d165b9e 100644 --- a/config.rb +++ b/config.rb @@ -76,7 +76,6 @@ set :casper, { description: 'Stories about Life and Technology', date_format: '%Y-%m-%d', navigation: true, - logo: 'home.svg', default_license: 'cc_by_sa' }, author: { diff --git a/source/author.html.haml b/source/author.html.haml index 6ad2aa0..2ef1b7d 100644 --- a/source/author.html.haml +++ b/source/author.html.haml @@ -7,9 +7,7 @@ cover_license: '[Cover Image](https://unsplash.com/photos/2ShvY8Lf6l0) by [Lukas %header.main-header.author-head{cover} %nav.main-nav.overlay.clearfix - - if blog_settings.logo.present? - %a.blog-logo{href: home_path} - = image_tag blog_settings.logo, alt: blog_settings.name + %a.home-button.icon-angle-left{href: home_path} Home - if blog_settings.navigation %a.menu-button.icon-menu{href: '#'} %span.word Menu diff --git a/source/fonts/icons.config.json b/source/fonts/icons.config.json index 5c43b11..c273424 100644 --- a/source/fonts/icons.config.json +++ b/source/fonts/icons.config.json @@ -30,6 +30,12 @@ "code": 62981, "src": "fontawesome" }, + { + "uid": "f3f90c8c89795da30f7444634476ea4f", + "css": "angle-left", + "code": 62990, + "src": "fontawesome" + }, { "uid": "4743b088aa95d6f3b6b990e770d3b647", "css": "facebook", diff --git a/source/fonts/icons.eot b/source/fonts/icons.eot index e3c36b31d58362e04907c3599d4b64461b8b1395..ae89c14f742650095ca90b927119770d82bf0835 100644 GIT binary patch delta 476 zcmXAlPe@xq5XNVApU;CZBOx(5gZBaExLq{xKURosMdy6in!(yIm;E62ArzI%%(I((8%C zRIOzCQ)2M%-gf|2Ae>4$_M&+ZZ==?KK zq55OuEOFGeH#GbZ*Tml{yllJ9kzD^zd_+r%ICyFYP2M K-{emy7J333cVv|S delta 337 zcmdmBe!`5+Lz;nMjnqUoGnOq5vh@=k^6M`!FfhCU;;`i0#DX{S+}ju!7+rwaE4i#h z0Voaxd|QA7S6V@OZpVZPkwE?d1_the^u*!y<7*%vsGmV4Be$eN{B#_U$-wmlNLb|LCnxgr@XP=j zE(7Gt)3=H+M4qM{+ZN4&aGXd2xFkISq y;}L{jw`uYmZgWPy$yc~7Ckyh(g3JYKVBp(q#`ByBC@#k@GueheW%D|ICLRFObW@K2 diff --git a/source/fonts/icons.svg b/source/fonts/icons.svg index ab5a1a4..45f2bf9 100644 --- a/source/fonts/icons.svg +++ b/source/fonts/icons.svg @@ -19,6 +19,7 @@ + \ No newline at end of file diff --git a/source/fonts/icons.ttf b/source/fonts/icons.ttf index 20b42fa00396b149071d9dea4ced994a1d7a4e85..a96e6e42e68b192cb5418bf79301c4df3dce3be3 100644 GIT binary patch delta 467 zcmW-d%S$6c5XP&fV;D2i<6CjX4X%nPq6Q5Lf+#)~FN+9*u%JzxBw$8c4L4dr%@7ljq-_#3_hqUx zGI}$42jvAZ9dng_30qf0Jc5{rt);`zaqN1eP+TY6yW+Js2 zkNi41Co*!tiKL_EgD0^DwEl)4O(va;3Y0U3S$;!P(oJvF?%+mNAJRZ-DW>d_(pzvE z9Cp=)rf=30_`v5y2WRld#&n}O!S6Sg;OJsWV^WW8U;KNI7wTIo_ExO5Opn C(qtC^ delta 399 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 ChV2Fb diff --git a/source/images/home.svg b/source/images/home.svg deleted file mode 100644 index 58b2cdf..0000000 --- a/source/images/home.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/source/layouts/page.haml b/source/layouts/page.haml index e47fc51..b731500 100644 --- a/source/layouts/page.haml +++ b/source/layouts/page.haml @@ -1,9 +1,7 @@ = wrap_layout :layout do %header.main-header.post-head{cover} %nav.main-nav.clearfix{class: cover? ? 'overlay' : nil} - - if blog_settings.logo.present? - %a.blog-logo{href: home_path} - = image_tag blog_settings.logo, alt: blog_settings.name + %a.home-button.icon-angle-left{href: home_path} Home - if blog_settings.navigation %a.menu-button.icon-menu{href: '#'} %span.word Menu diff --git a/source/layouts/post.haml b/source/layouts/post.haml index 22d7347..51106f3 100644 --- a/source/layouts/post.haml +++ b/source/layouts/post.haml @@ -1,9 +1,7 @@ = wrap_layout :layout do %header.main-header.post-head{cover} %nav.main-nav.clearfix{class: cover? ? 'overlay' : nil} - - if blog_settings.logo.present? - %a.blog-logo{href: home_path} - = image_tag blog_settings.logo, alt: blog_settings.name + %a.home-button.icon-angle-left{href: home_path} Home - if blog_settings.navigation %a.menu-button.icon-menu{href: '#'} %span.word Menu diff --git a/source/stylesheets/_icons.css.scss b/source/stylesheets/_icons.css.scss index 0f256fb..ab76989 100644 --- a/source/stylesheets/_icons.css.scss +++ b/source/stylesheets/_icons.css.scss @@ -1,10 +1,10 @@ @font-face { font-family: 'icons'; - src: url('../fonts/icons.eot?30442297'); - src: url('../fonts/icons.eot?30442297#iefix') format('embedded-opentype'), - url('../fonts/icons.woff?30442297') format('woff'), - url('../fonts/icons.ttf?30442297') format('truetype'), - url('../fonts/icons.svg?30442297#icons') format('svg'); + src: url('../fonts/icons.eot?82832280'); + src: url('../fonts/icons.eot?82832280#iefix') format('embedded-opentype'), + url('../fonts/icons.woff?82832280') format('woff'), + url('../fonts/icons.ttf?82832280') format('truetype'), + url('../fonts/icons.svg?82832280#icons') format('svg'); font-weight: normal; font-style: normal; } @@ -32,3 +32,4 @@ .icon-github:before { content: '\f60b'; } .icon-xing:before { content: '\f60c'; } .icon-mail:before { content: '\f60d'; } +.icon-angle-left:before { content: '\f60e'; } diff --git a/source/stylesheets/application.css.scss b/source/stylesheets/application.css.scss index 8050950..1fa9f96 100644 --- a/source/stylesheets/application.css.scss +++ b/source/stylesheets/application.css.scss @@ -3,6 +3,11 @@ @import 'syntax'; @import 'icons'; +.home-button { + @extend .menu-button; + float: left; +} + .byline { font-size: 1.8rem; line-height: 1; diff --git a/source/tag.html.haml b/source/tag.html.haml index bafcbaf..09b786a 100644 --- a/source/tag.html.haml +++ b/source/tag.html.haml @@ -6,9 +6,7 @@ cover_license: '[Cover Image](https://unsplash.com/photos/2ShvY8Lf6l0) by [Lukas %header.main-header.tag-head{cover} %nav.main-nav.overlay.clearfix - - if blog_settings.logo.present? - %a.blog-logo{href: home_path} - = image_tag blog_settings.logo, alt: blog_settings.name + %a.home-button.icon-angle-left{href: home_path} Home - if blog_settings.navigation %a.menu-button.icon-menu{href: '#'} %span.word Menu