From 984f5f62b63ac0e7f8149a716b3962fa7d69e4b0 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Tue, 29 Jun 2010 19:55:50 -0700 Subject: [PATCH] DG IZ; publisher reflects what type is selected --- app/views/shared/_publisher.haml | 16 +++++++++++++--- public/javascripts/publisher.js | 9 +++++++++ public/stylesheets/application.css | 16 ++++++---------- public/stylesheets/sass/application.sass | 16 +++++++--------- 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 78577c697..fd109b968 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -1,7 +1,7 @@ :css #publisher{ padding: 10px; - padding-top: 20px; + padding-top: 15px; padding-bottom: 35px; background-color: rgba( 242, 248, 252, 0.7 ); border-bottom: 2px #999 solid; @@ -21,17 +21,27 @@ ul#publisher_content_pickers { margin: 0; padding: 0; + text-shadow: 0 -2px 0 #fff; } ul#publisher_content_pickers li { display: inline; - margin-right: 20px; + padding: 5px 10px; + margin-right: 5px; + } + + .selected { + -webkit-border-radius: 5px; + border: 1px solid #ccc; + border-top: 1px solid #333; + -webkit-box-shadow: 0 2px 1px #fff; + background-color: rgba( 255, 255, 255, 0.5); } #publisher %ul#publisher_content_pickers %a{ :class => "status_message", :href => '#', :title => "new status message."} - %li status message + %li{ :class => "selected" } status message %a{ :class => "bookmark", :href => '#', :title => "new bookmark."} %li bookmark %a{ :class => "blog", :href => '#', :title => "new blog post."} diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index 61c39f67f..af783c84d 100644 --- a/public/javascripts/publisher.js +++ b/public/javascripts/publisher.js @@ -2,21 +2,30 @@ $("#publisher_content_pickers .status_message").click(function(){ if( $("#new_status_message").css("display") == "none" ) { + $("#publisher_content_pickers").children("a").children("li").removeClass("selected"); $("#publisher_form form").fadeOut(50); + + $(this).children("a > li").toggleClass("selected"); $("#new_status_message").delay(50).fadeIn(200); } }); $("#publisher_content_pickers .bookmark").click(function(){ if( $("#new_bookmark").css("display") == "none" ) { + $("#publisher_content_pickers").children("a").children("li").removeClass("selected"); $("#publisher_form form").fadeOut(50); + + $(this).children("li").toggleClass("selected"); $("#new_bookmark").delay(50).fadeIn(200); } }); $("#publisher_content_pickers .blog").click(function(){ if( $("#new_blog").css("display") == "none" ) { + $("#publisher_content_pickers").children("a").children("li").removeClass("selected"); $("#publisher_form form").fadeOut(50); + + $(this).children("li").toggleClass("selected"); $("#new_blog").delay(50).fadeIn(200); } }); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 3afa3fdac..2145ea585 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -84,20 +84,16 @@ header { ul#stream_filters { padding: 0; - margin: 0; } + margin: 0; + margin-bottom: 20px; } ul#stream_filters li { display: block; - padding: 5px 0; } - ul#stream_filters li:first-child { - border-top-right-radius: 5px; - border-top-left-radius: 5px; } - ul#stream_filters li:last-child { - border-bottom-right-radius: 5px; - border-bottom-left-radius: 5px; } + padding: 8px 0; + border-bottom: 1px #eeeeee solid; } ul#stream_filters a { color: #b1cfe3; } - ul#stream_filters a:hover { - color: black; } + ul#stream_filters a:hover { + color: black; } #header_below { margin: 0 -2em; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 21e061464..201c5bf58 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -93,19 +93,17 @@ header ul#stream_filters :padding 0 :margin 0 + :bottom 20px li :display block - :padding 5px 0 - &:first-child - :border-top-right-radius 5px - :border-top-left-radius 5px - &:last-child - :border-bottom-right-radius 5px - :border-bottom-left-radius 5px + :padding 8px 0 + :border + :bottom 1px #eee solid + a :color #B1CFE3 - a:hover - :color #000 + &:hover + :color #000 #header_below :margin 0 -2em