diff --git a/layouts/main.html b/layouts/main.html index daf38ae..e349375 100644 --- a/layouts/main.html +++ b/layouts/main.html @@ -46,13 +46,13 @@
+
<%= choixrss %>
+
<%= choixlang %>
-
<%= choixrss %>
-
<%= choixlang %>
diff --git a/site/css/less.css b/site/css/less.css index dedf304..0c6127c 100644 --- a/site/css/less.css +++ b/site/css/less.css @@ -26,44 +26,44 @@ a img { border: 0; } -/* line 1, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_16px.scss */ +/* line 3, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_18px.scss */ .gigantic { - font-size: 110px; - line-height: 120px; + font-size: 123px; + line-height: 132px; letter-spacing: -2px; } -/* line 7, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_16px.scss */ +/* line 9, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_18px.scss */ .huge, h1 { - font-size: 68px; - line-height: 72px; + font-size: 76px; + line-height: 84px; letter-spacing: -1px; } -/* line 13, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_16px.scss */ +/* line 15, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_18px.scss */ .large, h2 { - font-size: 42px; + font-size: 47px; line-height: 48px; } -/* line 18, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_16px.scss */ +/* line 20, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_18px.scss */ .bigger, h3 { - font-size: 26px; + font-size: 29px; line-height: 36px; } -/* line 23, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_16px.scss */ +/* line 25, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_18px.scss */ .big, h4 { - font-size: 22px; + font-size: 25px; line-height: 30px; } -/* line 28, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_16px.scss */ +/* line 30, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_18px.scss */ body { - font: 16px/24px Georgia, serif; + font: 18px/24px "Times New Roman", Times, serif; } -/* line 32, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_16px.scss */ +/* line 34, ../../../../../../var/lib/gems/1.8/gems/compass-less-plugin-1.0/stylesheets/less/typography/_18px.scss */ .small, small { font-size: 13px; line-height: 18px; diff --git a/site/css/main.css b/site/css/main.css index 5182671..8055ddb 100644 --- a/site/css/main.css +++ b/site/css/main.css @@ -1,28 +1,28 @@ @charset "UTF-8"; -/* line 26, ../src/main.scss */ +/* line 33, ../src/main.scss */ body { background-color: #f6f6f0; font-family: 'Kreon', Palatino, Georgia, arial, serif; } -/* line 31, ../src/main.scss */ +/* line 38, ../src/main.scss */ a { color: #7689a6; border: none; text-decoration: none; } -/* line 36, ../src/main.scss */ +/* line 43, ../src/main.scss */ a:hover { - color: #88aadd; + color: #ee6666; } -/* line 40, ../src/main.scss */ +/* line 47, ../src/main.scss */ #metacontainer { border-bottom: 1px solid #888; } -/* line 43, ../src/main.scss */ +/* line 50, ../src/main.scss */ body > header { margin: 0; color: #CCC; @@ -35,7 +35,7 @@ body > header { box-shadow: #333333 0px 1px 5px 0; } -/* line 51, ../src/main.scss */ +/* line 58, ../src/main.scss */ body > footer { border-top: solid 2px rgba(0, 0, 0, 0.1); border-bottom: solid 1px rgba(0, 0, 0, 0.1); @@ -51,57 +51,103 @@ body > footer { box-shadow: #888888 0px 1px 5px 0; } -/* line 62, ../src/main.scss */ +/* line 72, ../src/main.scss */ nav { border-bottom: solid 1px rgba(0, 0, 0, 0.1); } -/* line 65, ../src/main.scss */ +/* line 75, ../src/main.scss */ nav ul { list-style-type: none; } -/* line 68, ../src/main.scss */ +/* line 78, ../src/main.scss */ nav ul li { display: inline-block; height: 50px; margin-right: 0; + width: 6em; text-align: center; border-left: solid 1px rgba(255, 255, 255, 0.1); border-right: solid 1px rgba(0, 0, 0, 0.2); } -/* line 76, ../src/main.scss */ -nav ul li a { - color: rgba(255, 255, 255, 0.8); +/* line 87, ../src/main.scss */ +nav ul li * { display: block; margin-right: 0px; margin-left: 0px; - text-shadow: -1px -1px rgba(0, 0, 0, 0.2), 1px 1px rgba(0, 0, 0, 0.2); padding: 0 10px; height: 100%; + text-shadow: -1px -1px rgba(0, 0, 0, 0.2), 1px 1px rgba(0, 0, 0, 0.2); } -/* line 84, ../src/main.scss */ +/* line 95, ../src/main.scss */ +nav ul li span.active { + background-color: #002233; +} + +/* line 98, ../src/main.scss */ +nav ul li a { + color: rgba(255, 255, 255, 0.8); +} + +/* line 101, ../src/main.scss */ nav ul li a:hover { color: rgba(255, 255, 255, 0.8); background-color: rgba(255, 255, 255, 0.1); } -/* line 88, ../src/main.scss */ +/* line 106, ../src/main.scss */ +header #choixrss, header #choixlang { + display: block; + margin-right: 0px; + margin-left: 0px; + height: 100%; + text-shadow: -1px -1px rgba(0, 0, 0, 0.2), 1px 1px rgba(0, 0, 0, 0.2); + float: right; + height: 50px; + text-align: center; + border-left: solid 1px rgba(255, 255, 255, 0.1); + border-right: solid 1px rgba(0, 0, 0, 0.2); +} + +/* line 118, ../src/main.scss */ +header #choixrss a, header #choixlang a { + color: #bcd0ee; + display: block; + height: 100%; + width: 6em; + padding: 0 10px 0 10px; + text-align: center; +} + +/* line 126, ../src/main.scss */ +header #choixrss a:hover, header #choixlang a:hover { + color: rgba(255, 255, 255, 0.8); + background-color: rgba(255, 255, 255, 0.1); +} + +/* line 131, ../src/main.scss */ #main { margin: 0px auto; } -/* line 91, ../src/main.scss */ +/* line 134, ../src/main.scss */ #container { margin: 0px auto; } -/* line 95, ../src/main.scss */ +/* line 138, ../src/main.scss */ h1, h2, h3, h4, h5, h6 { font-family: 'Expletus Sans',Futura,sans-serif; text-shadow: 0px -1px 0px #2233aa, 0px 1px 0px white; font-weight: bold; color: #88aadd; + margin: 48px 0; +} + +/* line 147, ../src/main.scss */ +h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover { + text-shadow: 0px -1px 0px #441111, 0px 1px 0px white; } diff --git a/site/src/less.scss b/site/src/less.scss index 94c7558..04b839f 100644 --- a/site/src/less.scss +++ b/site/src/less.scss @@ -11,7 +11,7 @@ $less-grid-element: unquote("#container"); @import "less/reset"; @import "less/framework"; -@import "less/typography/16px"; +@import "less/typography/18px"; @import "partials/global"; @import "partials/default"; diff --git a/site/src/main.scss b/site/src/main.scss index 78331d0..8237520 100644 --- a/site/src/main.scss +++ b/site/src/main.scss @@ -17,12 +17,19 @@ $dark : #2C5490; $darkGrey : #7689A6; $backgroundColor: #f6f6f0; +$hoverColor: #E66; +$hoverColorShadow: #411; $higlightColor: #8AD; $higlightColorShadow: #23A; +$selectedBlockColor: #023; $topColor: #2C5490; $footerColor: #BCD0EE; $linkColor: $darkGrey; +// Height + +$navHeight: 50px; + body { background-color: $backgroundColor; font-family: 'Kreon', Palatino, Georgia, arial, serif; @@ -34,7 +41,7 @@ a { text-decoration: none; } a:hover { - color: $higlightColor; + color: $hoverColor; } #metacontainer{ @@ -44,7 +51,7 @@ body > header { margin: 0; color: #CCC; background-color: $topColor; - line-height: 50px; + line-height: $navHeight; font-weight: bold; @include box-shadow(); } @@ -59,6 +66,9 @@ body > footer { text-shadow: 1px 1px #fff; @include box-shadow(#888); } + +$menuItemWidth: 6em; + nav { border-bottom: solid 1px rgba(0,0,0,0.1); } @@ -67,24 +77,57 @@ nav ul { } nav ul li { display: inline-block; - height: 50px; + height: $navHeight; margin-right: 0; + width: $menuItemWidth; text-align: center; border-left: solid 1px rgba(255,255,255,0.1); border-right: solid 1px rgba(0,0,0,0.2); } -nav ul li a { color: rgba(255,255,255,0.8); - display: block; - margin-right: 0px; - margin-left: 0px; - text-shadow: -1px -1px rgba(0,0,0,0.2), 1px 1px rgba(0,0,0,0.2); - padding: 0 10px; - height: 100%; - } +nav ul li * { + display: block; + margin-right: 0px; + margin-left: 0px; + padding: 0 10px; + height: 100%; + text-shadow: -1px -1px rgba(0,0,0,0.2), 1px 1px rgba(0,0,0,0.2); +} +nav ul li span.active { + background-color: $selectedBlockColor; +} +nav ul li a { + color: rgba(255,255,255,0.8); +} nav ul li a:hover { color: rgba(255,255,255,0.8); background-color: rgba(255,255,255,0.1); } + +header #choixrss, header #choixlang { + display: block; + margin-right: 0px; + margin-left: 0px; + height: 100%; + text-shadow: -1px -1px rgba(0,0,0,0.2), 1px 1px rgba(0,0,0,0.2); + float: right; + height: $navHeight; + text-align: center; + border-left: solid 1px rgba(255,255,255,0.1); + border-right: solid 1px rgba(0,0,0,0.2); +} +header #choixrss a, header #choixlang a { + color: $lightGrey; + display: block; + height: 100%; + width: $menuItemWidth; + padding: 0 10px 0 10px; + text-align: center; +} +header #choixrss a:hover, header #choixlang a:hover { + color: rgba(255,255,255,0.8); + background-color: rgba(255,255,255,0.1); +} + #main { margin: 0px auto; } @@ -97,4 +140,11 @@ h1, h2, h3, h4, h5, h6 { text-shadow: 0px -1px 0px $higlightColorShadow, 0px 1px 0px #FFF; font-weight: bold; color: $higlightColor; + margin: 48px 0; +} + +h1, h2, h3, h4, h5, h6 { + a:hover { + text-shadow: 0px -1px 0px $hoverColorShadow, 0px 1px 0px #FFF; + } }