From f1635548deeaa2b11e506373c4d9f9cdedf09842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 12 Aug 2012 19:09:08 +0200 Subject: [PATCH] more css3 features in navbar --- source/_navbar.slim | 13 ++-- source/index.html.slim | 2 +- source/privat.html.slim | 2 +- source/stylesheets/font-awesome.css.scss | 2 +- source/stylesheets/site.css.scss | 81 ++++++++++++++---------- source/stylesheets/solarized.css.scss | 13 +++- 6 files changed, 66 insertions(+), 47 deletions(-) diff --git a/source/_navbar.slim b/source/_navbar.slim index a3f52f8..a8f581e 100644 --- a/source/_navbar.slim +++ b/source/_navbar.slim @@ -1,6 +1,7 @@ -==link_to "Higgs-Boson", "/", :id => "sitelink", :title => "Startpage" -ul - li - ==link_to "Impressum", "/impressum.html", :class => "navlink", :title => "Impressum" - li - ==link_to "About", "#about", :class => "navlink", :title => "About" +nav + ==link_to "Higgs-Boson", "/", :id => "sitelink", :title => "Startpage" + ul + li + ==link_to "Impressum", "/impressum.html", :class => "navlink", :title => "Impressum" + li + ==link_to "About", "#about", :class => "navlink", :title => "About" diff --git a/source/index.html.slim b/source/index.html.slim index f445e7a..7e4125f 100644 --- a/source/index.html.slim +++ b/source/index.html.slim @@ -2,7 +2,7 @@ h1#pagetitle Higgs-Boson h2#pagesubtitle Where dreams become true section - ul.icons + ul#overview.icons li i.icon-github a href="http://git.higgsboson.tk/pub" title="Webinterface to our public git repos" Git Web diff --git a/source/privat.html.slim b/source/privat.html.slim index 694fa37..e0c4703 100644 --- a/source/privat.html.slim +++ b/source/privat.html.slim @@ -1,6 +1,6 @@ h1 Internal Services section - ul.icons + ul#overview.icons li i.icon-envelope a href="https://mail.higgsboson.tk" Mail diff --git a/source/stylesheets/font-awesome.css.scss b/source/stylesheets/font-awesome.css.scss index 9ff87d9..2ae5182 100644 --- a/source/stylesheets/font-awesome.css.scss +++ b/source/stylesheets/font-awesome.css.scss @@ -30,7 +30,7 @@ $fontAwesomePath: "fontawesome-webfont" !default; font-files( "#{$fontAwesomePath}.woff", woff, "#{$fontAwesomePath}.ttf", truetype, - "#{$fontAwesomePath}.svg#FontAwesomeRegular", svg), + "#{$fontAwesomePath}.svg#FontAwesome", svg), '#{$fontAwesomePath}.eot', normal, normal); diff --git a/source/stylesheets/site.css.scss b/source/stylesheets/site.css.scss index edc8dc6..6bd8058 100644 --- a/source/stylesheets/site.css.scss +++ b/source/stylesheets/site.css.scss @@ -18,44 +18,10 @@ body { line-height: 1.3em; } -#sitelink { - float: left; - font-size: 1.1em; - padding-right: 0.1em; - padding-left: 0.1em; -} - - -#pagetitle { - @include text-shadow(0px, -1px, 1px, rgb(255, 255, 255), 0px, 1px, 1px, rgb(102, 102, 102)); -} - -.container { - @include grid_container; - @include clearfix; - @include accentize($yellow); - - - /* Grid layout */ - #main { - margin-top: 50px; - @include grid(12); - @include clearfix; - } - -} -.icons { - font-size: 2em; - li { - line-height: 0.8em; - } -} - a { text-decoration:none; &:hover { - font-weight:bold; - letter-spacing:-0.0565em; + text-decoration:underline; } } @@ -79,9 +45,54 @@ header { margin: 0px; padding: 0px; } + box-shadow: 0 2px 3px #b8b8b8; } footer { @include grid(12); padding-left: 15px; + box-shadow: 0 2px 3px #b8b8b8; } + +.container { + @include grid_container; + @include clearfix; + @include accentize($yellow); + + + /* Grid layout */ + #main { + margin-top: 50px; + @include grid(12); + @include clearfix; + } +} + +.navlink { + &:hover { + text-decoration: none; + } +} + +#sitelink { + float: left; + font-size: 1.1em; + padding-right: 0.1em; + padding-left: 0.1em; + &:hover { + text-decoration: none; + } +} + +#pagetitle { + @include text-shadow(0px, -1px, 1px, rgb(255,255,255), 0px, 1px, 1px, rgb(102,102,102)); +} + + +#overview { + font-size: 2em; + li { + line-height: 0.8em; + } +} + diff --git a/source/stylesheets/solarized.css.scss b/source/stylesheets/solarized.css.scss index c9fd75c..57d9959 100644 --- a/source/stylesheets/solarized.css.scss +++ b/source/stylesheets/solarized.css.scss @@ -29,11 +29,18 @@ $green: #859900; background-color: $rebase01; color: $rebase1; - a.navlink, a:active.navlink, a:visited.navlink { color: $rebase1; } + a.navlink, a:active.navlink, a:visited.navlink { + color: $rebase1; + text-shadow: 1px 1px 1px #ADBAC0; + } a:hover.navlink { background: transparent; color: $rebase02; } - #sitelink { color: $rebase02; background-color: $rebase1 } - a:hover#sitelink { font-weight: bold; } + #sitelink { + color: $rebase02; background-color: $rebase1; + &:hover{ + color: $rebase03; + } + } } footer { background-color: $rebase02;