From da443039e1f041d2f8cafa037acf8e70dd18bcf0 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 27 Oct 2014 16:34:35 +0200 Subject: [PATCH] Move custom code from _font-awesome.scss to _style.scss. Also change the order of includes so that _style.scss is last for precedence reasons. --- site/_sass/_font-awesome.scss | 18 ------------------ site/_sass/_style.scss | 19 +++++++++++++++++++ site/css/screen.scss | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/site/_sass/_font-awesome.scss b/site/_sass/_font-awesome.scss index afdd60c3..24ae2b61 100644 --- a/site/_sass/_font-awesome.scss +++ b/site/_sass/_font-awesome.scss @@ -20,21 +20,3 @@ .fa-link:before { content: "\f0c1"; } -/* - * This code is courtesy Ben Balter, modified by Parker Moore for jekyllrb.com - * http://ben.balter.com/2014/03/13/pages-anchor-links/ - */ -.header-link { - position: relative; - left: 0.5em; - opacity: 0; - font-size: 0.8em; - @include transition(opacity 0.2s ease-in-out 0.1s); -} -h2:hover .header-link, -h3:hover .header-link, -h4:hover .header-link, -h5:hover .header-link, -h6:hover .header-link { - opacity: 1; -} diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss index f1e1ff14..e97ee094 100644 --- a/site/_sass/_style.scss +++ b/site/_sass/_style.scss @@ -131,6 +131,25 @@ nav { } } +/* + * This code is courtesy Ben Balter, modified by Parker Moore for jekyllrb.com + * http://ben.balter.com/2014/03/13/pages-anchor-links/ + */ +.header-link { + position: relative; + left: 0.5em; + opacity: 0; + font-size: 0.8em; + @include transition(opacity 0.2s ease-in-out 0.1s); +} +h2:hover .header-link, +h3:hover .header-link, +h4:hover .header-link, +h5:hover .header-link, +h6:hover .header-link { + opacity: 1; +} + @media (max-width: 768px) { .main-nav ul { text-align: right; diff --git a/site/css/screen.scss b/site/css/screen.scss index a539851a..2eff7f89 100644 --- a/site/css/screen.scss +++ b/site/css/screen.scss @@ -4,6 +4,6 @@ @import "mixins"; @import "normalize"; @import "gridism"; -@import "style"; @import "pygments"; @import "font-awesome"; +@import "style";