From d710ff6f4ab27824663148148da9191de102b533 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Tue, 27 Jul 2010 23:08:43 -0700 Subject: [PATCH 1/3] shadows on album titles on album/index --- public/stylesheets/application.css | 5 +++-- public/stylesheets/sass/application.sass | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 6ee9d2f62..44444b54a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -67,7 +67,7 @@ header { margin-bottom: 1em; color: #555555; background-color: #2b2726; - border-bottom: 1px solid #444444; + border-bottom: 3px solid #333333; padding: 6px 0; padding-top: 0; } header #diaspora_text { @@ -334,7 +334,8 @@ ul#publisher_content_pickers li { padding: 1em; background: rgba(0, 0, 0, 0.8); bottom: 20px; - font-size: 18px; } + font-size: 18px; + text-shadow: 0 2px 0 black; } .album .name .time { font-size: 12px; } .album .name .time a { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index c149735ad..b8c9ad7f0 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -73,7 +73,7 @@ header :background :color #2B2726 :border - :bottom 1px solid #444 + :bottom 3px solid #333 :padding 6px 0 :top 0 @@ -407,6 +407,8 @@ ul#publisher_content_pickers li :bottom 20px :font :size 18px + + :text-shadow 0 2px 0 #000 .time :font From e2b5af35c1721bae0c0bfdef3517c2cb0f855c3e Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 28 Jul 2010 00:04:43 -0700 Subject: [PATCH 2/3] minute changes --- app/views/albums/_album.html.haml | 2 +- app/views/albums/index.html.haml | 10 ++++++---- app/views/albums/show.html.haml | 2 +- app/views/dashboards/index.html.haml | 4 ++-- app/views/layouts/application.html.haml | 4 ++-- app/views/people/index.html.haml | 7 ++++++- app/views/requests/index.html.haml | 2 +- app/views/shared/_publisher.haml | 2 -- public/stylesheets/application.css | 6 +++--- public/stylesheets/sass/application.sass | 11 ++++++----- public/stylesheets/sass/ui.sass | 1 + public/stylesheets/ui.css | 1 + 12 files changed, 30 insertions(+), 22 deletions(-) diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml index 6b76a27b1..3835fd377 100644 --- a/app/views/albums/_album.html.haml +++ b/app/views/albums/_album.html.haml @@ -4,7 +4,7 @@ = link_to post.name, object_path(post) %div.time - by: + by = album_person(post) %br = link_to(how_long_ago(post), object_path(post)) diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 56b0b6bb8..efdef8872 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -1,16 +1,18 @@ %h1.big_text .back = link_to "⇧ home", root_path - %ul.button_set - %li.selected= friends_albums_link - %li= your_albums_link - + Albums .button.right#add_album_button = link_to 'New Album', "#" #add_album_box.contextual_pane = render "albums/new_album" +.sub_header + %ul.button_set + %li.selected= friends_albums_link + %li= your_albums_link + %ul#stream - for album in @albums = render "album", :post => album diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index 79a46315d..d03622679 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -12,7 +12,7 @@ = render "photos/new_photo", :photo => @photo, :album => @album .sub_header - ="last updated: #{how_long_ago(@album)}" + ="updated #{how_long_ago(@album)}" -unless mine? @album %h4= "by #{@album.person.real_name}" diff --git a/app/views/dashboards/index.html.haml b/app/views/dashboards/index.html.haml index b358d5e5b..5cab5d2d5 100644 --- a/app/views/dashboards/index.html.haml +++ b/app/views/dashboards/index.html.haml @@ -2,8 +2,8 @@ %h1#user_name = link_to current_user.real_name, root_path %span= title_for_page - %h3 - #latest_message= my_latest_message + %h3#latest_message + = my_latest_message = render "shared/publisher" %ul#stream - for post in @posts diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 736d8b587..f676c862f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -52,9 +52,9 @@ .container .span-24.last - .span-19.append-1.last + .span-20.append-1.last = yield - .span-4.last + .span-3.last = link_to(person_image_tag(current_user), root_path) %br = link_to "Edit your profile", edit_user_path(current_user) diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml index b688b3c5d..cfc12dcc9 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -1,4 +1,9 @@ -- title "People" +%h1.big_text + .back + = link_to '⇧ home', root_path + Friends + .button.right + = link_to 'Add Friend', requests_path %table %tr diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml index c7943f49c..8278719ee 100644 --- a/app/views/requests/index.html.haml +++ b/app/views/requests/index.html.haml @@ -1,7 +1,7 @@ %h1.big_text .back = link_to "⇧ home", root_path - requests + Requests = render "requests/new_request", :request => @request diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index b7bfae5e9..2ac0bcc65 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -1,6 +1,4 @@ #publisher - %sp - POST: %ul#publisher_content_pickers %li{ :class => "status_message selected" }= link_to "status message", "#" %li{ :class => "bookmark" }= link_to "bookmark", "#" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 44444b54a..babf9c2e3 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -172,6 +172,9 @@ form { color: #dddddd; float: right; } +#latest_message { + font-weight: normal; } + #stream div.comments { display: none; } @@ -282,9 +285,6 @@ label { color: #999999; padding: 20px 1em; padding-top: 10px; } - #publisher sp { - font-family: "BrandonGrotesqueLightRegular"; - font-size: large; } #new_blog, #new_bookmark { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index b8c9ad7f0..245abf70c 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -202,6 +202,10 @@ form :size 30% :color #dddddd :float right + +#latest_message + :font + :weight normal #stream div.comments @@ -337,11 +341,6 @@ label :color #999 :padding 20px 1em :top 10px - sp - :font - :family 'BrandonGrotesqueLightRegular' - :font-size large - #new_blog, #new_bookmark @@ -473,3 +472,5 @@ h1.big_text :top -5px :bottom 20px :color #999 + + diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass index eaa2f674c..213953d7f 100644 --- a/public/stylesheets/sass/ui.sass +++ b/public/stylesheets/sass/ui.sass @@ -1,6 +1,7 @@ .button, .button_set :font :family "Lucida Grande", sans-serif + :style normal :display inline diff --git a/public/stylesheets/ui.css b/public/stylesheets/ui.css index c760a1b0f..3fef3ac8c 100644 --- a/public/stylesheets/ui.css +++ b/public/stylesheets/ui.css @@ -1,5 +1,6 @@ .button, .button_set { font-family: "Lucida Grande", sans-serif; + font-style: normal; display: inline; color: #777777; font-size: 12px; From ef0a2c465de5292a0b2ad7156f9e6dc7aeee90fb Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 28 Jul 2010 10:06:20 -0700 Subject: [PATCH 3/3] fixed photo show comment picture bug --- public/stylesheets/application.css | 3 ++- public/stylesheets/sass/application.sass | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index babf9c2e3..c42431ab1 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -204,7 +204,8 @@ ul.comment_set { margin-top: -5px; padding-bottom: 8px; } -#stream img.person_picture, #profile img.person_picture { +#stream img.person_picture, #profile img.person_picture, +.comments img.person_picture { border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 245abf70c..9ca7b126a 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -247,7 +247,8 @@ ul.comment_set :padding :bottom 8px -#stream, #profile +#stream, #profile, +.comments img.person_picture :border-radius 3px :-webkit-border-radius 3px