From 6c729b382f6a4618f7e4c68a392126293ff29f66 Mon Sep 17 00:00:00 2001 From: ilya Date: Tue, 17 Aug 2010 21:50:18 -0700 Subject: [PATCH] fixed some color on the header --- public/javascripts/group_nav.js | 2 -- public/stylesheets/application.css | 23 +++++++++++------------ public/stylesheets/sass/application.sass | 20 +++++++++----------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/public/javascripts/group_nav.js b/public/javascripts/group_nav.js index f3d9600bb..5f5347c31 100644 --- a/public/javascripts/group_nav.js +++ b/public/javascripts/group_nav.js @@ -11,6 +11,4 @@ $(document).ready( function() { $("."+vars['g']).addClass('selected'); - $("#group img").load(function(){$(this).fadeIn("slow");}); - }); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 0d8edc7da..18289b738 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -67,10 +67,9 @@ header { position: relative; margin: -2em; margin-bottom: 20px; - color: #555555; - background-color: #2b2726; - background-color: black; - border-bottom: 3px solid #333333; + color: black; + background-color: #333333; + border-bottom: 3px solid black; padding: 6px 0; padding-top: 0; } header #diaspora_text { @@ -420,7 +419,7 @@ h1.big_text { display: none; } #group { - color: #333333; } + color: black; } #group ul { margin: 0; padding: 0; @@ -431,25 +430,25 @@ h1.big_text { #group ul > li.selected, #group ul > li.selected a { color: white; font-weight: bold; - font-size: 18px; } + font-size: 18px; + text-shadow: 0 2px 0px black; } #group a { - color: #333333; + color: #aaaaaa; font-weight: normal; } #group #friend_pictures .add_new { position: relative; display: inline-block; height: 40px; width: 40px; - background-color: #222222; + background-color: black; text-align: center; font-size: 40px; - line-height: 33px; - top: -9px; } + line-height: 40px; + top: -6px; } #group #friend_pictures .add_new:hover { background: #999999; color: black; } #group #friend_pictures img { - display: none; height: 40px; } #add_photo_loader { @@ -459,7 +458,7 @@ h1.big_text { top: 4px; } #user_menu { - background: #333333; + background: black; padding: 5px; margin: 0; list-style: none; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 9ef450368..0ac9dbfce 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -71,12 +71,11 @@ header :position relative :margin -2em :bottom 20px - :color #555 + :color #000 :background - :color #2B2726 - :color #000 + :color #333 :border - :bottom 3px solid #333 + :bottom 3px solid #000 :padding 6px 0 :top 0 @@ -524,7 +523,7 @@ h1.big_text :display none #group - :color #333 + :color #000 ul :margin 0 :padding 0 @@ -542,7 +541,7 @@ h1.big_text :size 18px a - :color #333 + :color #aaa :font :weight normal @@ -553,18 +552,17 @@ h1.big_text :height 40px :width 40px :background - :color #222 + :color #000 :text-align center :font-size 40px - :line-height 33px - :top -9px + :line-height 40px + :top -6px &:hover :background #999 :color #000 img - :display none :height 40px #add_photo_loader @@ -574,7 +572,7 @@ h1.big_text :top 4px #user_menu - :background #333 + :background #000 :padding 5px :margin 0 :list-style none