diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml index 1580c9cae..b505cf76b 100644 --- a/app/views/albums/edit.html.haml +++ b/app/views/albums/edit.html.haml @@ -1,6 +1,5 @@ +.back= link_to "⇧ #{@album.name}", @album %h1.big_text - .back - = link_to "⇧ #{@album.name}", @album = "Editing #{@album.name}" diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 59db9c376..47d2f68a9 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -1,6 +1,5 @@ +.back= link_to "⇧ home", root_path %h1.big_text - .back - = link_to "⇧ home", root_path Albums .right = link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"} diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index a2cded0c9..b63dea9de 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -1,6 +1,5 @@ +.back= link_to '⇧ albums', albums_path %h1.big_text - .back - = link_to '⇧ albums', albums_path = @album.name diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 9cae263dd..05443591f 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -1,6 +1,5 @@ +.back= link_to "⇧ #{@album.name}", album_path(@album) %h1.big_text - .back - = link_to "⇧ #{@album.name}", album_path(@album) = @photo.image .right diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml index 479e1b967..66f4fa0bd 100644 --- a/app/views/shared/_group_nav.haml +++ b/app/views/shared/_group_nav.haml @@ -14,9 +14,8 @@ #friend_pictures - for friend in @group.people = person_image_link(friend) + = link_to "+", "#add_request_pane", :id => 'add_request_button', :class => "add_new" - .add_new - = link_to "+", "#add_request_pane", :id => 'add_request_button' .yo{:style => 'display:none'} #add_request_pane = render "requests/new_request" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 7ce7663ea..05a80acf2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -377,8 +377,7 @@ ul#publisher_content_pickers li { h1.big_text { position: relative; line-height: auto; - border-bottom: 1px solid #666666; - text-align: center; } + border-bottom: 1px solid #666666; } .big_text .right { top: -8px; } @@ -391,7 +390,6 @@ h1.big_text { float: right; } .back { - position: absolute; font-size: 12px; font-weight: normal; } @@ -449,12 +447,12 @@ h1.big_text { width: 40px; background-color: #222222; text-align: center; - font-size: 40px; } - #group #friend_pictures .add_new a { - display: block; - position: absolute; - top: -13px; - left: 7px; } + font-size: 40px; + line-height: 33px; + top: -9px; } + #group #friend_pictures .add_new:hover { + background: #999999; + color: black; } #group #friend_pictures img { display: none; height: 40px; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 841f12a97..516d7a566 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -469,8 +469,6 @@ h1.big_text :border //:top 2px solid #666 :bottom 1px solid #666 - :text - :align center .big_text .right @@ -484,7 +482,6 @@ h1.big_text :float right .back - :position absolute :font :size 12px :weight normal @@ -563,11 +560,13 @@ h1.big_text :color #222 :text-align center :font-size 40px - a - :display block - :position absolute - :top -13px - :left 7px + :line-height 33px + :top -9px + + &:hover + :background #999 + :color #000 + img :display none :height 40px