diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 5931461d7..56b0b6bb8 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -6,7 +6,7 @@ %li= your_albums_link .button.right#add_album_button - = link_to 'new album', "#" + = link_to 'New Album', "#" #add_album_box.contextual_pane = render "albums/new_album" @@ -17,5 +17,6 @@ #pagination = will_paginate @albums -%h3 - = link_to "make a new album", new_album_path unless params[:friends] +#content_bottom + .back + = link_to "⇧ home", root_path diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index d7ca04b6a..85affca6b 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -4,10 +4,12 @@ = @photo.image .button.right - = link_to 'edit', '#' + = link_to 'Edit', '#' + +.sub_header + = link_to "full size", @photo.image.url %div{:id => @photo.id} - = link_to "full size", @photo.image.url #show_photo = link_to_prev @photo, @album diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml index da924b05e..714168fd2 100644 --- a/app/views/requests/_new_request.haml +++ b/app/views/requests/_new_request.haml @@ -1,7 +1,8 @@ = form_for @request do |f| = f.error_messages - enter a diaspora url, diaspora username, or random email address: + Enter a Diaspora URL, Diaspora username, or random email address: .field_with_submit = f.text_field :destination_url = f.submit + diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml index 8347c76d8..c7943f49c 100644 --- a/app/views/requests/index.html.haml +++ b/app/views/requests/index.html.haml @@ -11,3 +11,6 @@ - for request in @remote_requests = render "request", :request => request +#content_bottom + .back + = link_to "⇧ home", root_path diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c2ed05d18..c4c89497d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -345,7 +345,7 @@ ul#publisher_content_pickers li { -moz-border-radius: 3px; } .field_with_submit input[type='text'] { - width: 85%; + width: 82%; display: inline; } h1.big_text { @@ -374,3 +374,10 @@ h1.big_text { .show_post_comments ul.comment_set { width: 100%; } + +.sub_header { + text-align: center; + font-style: italic; + margin-top: -5px; + margin-bottom: 15px; + color: #999999; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index e293bfdfc..8103fd7e0 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -423,7 +423,7 @@ ul#publisher_content_pickers li .field_with_submit input[type='text'] - :width 85% + :width 82% :display inline h1.big_text @@ -445,9 +445,6 @@ h1.big_text :font :size 12px - - - #content_bottom :position relative :line-height 36px @@ -464,3 +461,13 @@ h1.big_text .show_post_comments ul.comment_set :width 100% + +.sub_header + :text + :align center + :font + :style italic + :margin + :top -5px + :bottom 15px + :color #999