From ecaf7974e3e29974ce6a91a714fc7abb5e2178e1 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 5 Jul 2011 16:27:41 -0700 Subject: [PATCH] removed fixed sidebar for tag following --- app/views/aspects/index.html.haml | 13 +++++++++---- public/stylesheets/sass/application.sass | 4 ++-- public/stylesheets/sass/ui.sass | 11 +++++++++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 955be3176..32d910cba 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -6,7 +6,7 @@ - content_for :head do = include_javascripts :home -.span-5.leftNavBar.fixed +.span-5.leftNavBar #home_user_badge = owner_image_link %h3 @@ -22,11 +22,16 @@ = t('aspects.index.tags_following') %ul.sub_nav - - for tg in tags + - if tags.size > 0 + - for tg in tags + %li + = link_to "##{tg.name}", tag_path(:name => tg.name), :class => "tag_selector" + - else %li - = link_to "##{tg.name}", tag_path(:name => tg.name), :class => "tag_selector" + %span.new_aspect + No tags -.span-13.append-1.prepend-5 +.span-13.append-1 #aspect_stream_container.stream_container = render 'aspect_stream', :aspect => @aspect, diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a555a3eaf..1f3770e4b 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -2849,7 +2849,7 @@ ul.left_nav :width 155px a.aspect_selector, - a.new_aspect, + .new_aspect, a.tag_selector :padding :left 15px @@ -2870,7 +2870,7 @@ ul.left_nav :width 140px a.aspect_selector, - a.new_aspect, + .new_aspect, a.tag_selector :width 140px diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass index 4a34b1ae4..f870ceeae 100644 --- a/public/stylesheets/sass/ui.sass +++ b/public/stylesheets/sass/ui.sass @@ -85,8 +85,15 @@ .button.red_on_hover &:hover - @include linear-gradient(desaturate(lighten($red, 20%),20%), desaturate(lighten($red,14%),20%)) - :color black + @include linear-gradient(lighten(#F74427, 10%), darken(#F74427,0%)) + :color #222 + + :border 1px solid #666 + :top 1px solid #777 + :bottom 1px solid darken(#666,13%) + + &:active + :text-shadow none .right :position absolute