diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb index aab2aa7a636caf741f08f0ee1e6f7e237dcd4fa8..457e9d52225951d3417bf3bd8549e19584be4734 100644 --- a/app/helpers/dashboards_helper.rb +++ b/app/helpers/dashboards_helper.rb @@ -2,9 +2,9 @@ module DashboardsHelper def title_for_page if params[:action] =='ostatus' - 'OStatus Dashboard' + 'OStatus home' else - 'Dashboard' + 'home' end end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 67a1646b4761211cad691e8faecff6b9a3f0313b..50f8f6ee41b60919c5eca14c7156e62e9088de4f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -40,6 +40,8 @@ - else = link_to "login", new_user_session_path .container + = link_to "home", root_path + | = link_to "photos", albums_path | = link_to "ostatus", ostatus_path @@ -48,14 +50,14 @@ .container .span-24.last - .span-3.append-1.last + .span-3.append-2.last = link_to person_image_tag(User.owner), root_path = link_to "Edit your profile", edit_user_path(current_user) %br %br = render 'people/sidebar' if user_signed_in? - - .span-18.last + .span-19.last = yield + .span-24.last = render "posts/debug" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index ce04e18f8a22e24e5db3809336a607d85d5caa95..21ad80d48dfe83fd5f1f658fa251948ef7059cf9 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -64,7 +64,7 @@ a { header { position: relative; margin: -2em; - margin-bottom: 2em; + margin-bottom: 1em; color: #555555; background-color: #2b2726; border-bottom: 1px solid #444444; @@ -80,7 +80,7 @@ header { color: white; text-shadow: 0 2px 0 black; } header #diaspora_text a { - color: white; } + color: #666666; } header #diaspora_text span.sub_text { color: black; text-shadow: none; } @@ -156,6 +156,7 @@ form { margin-left: 0em; } #user_name { + display: inline; margin-bottom: 1em; } #user_name a { color: black; } @@ -197,7 +198,8 @@ img.person_picture { display: inline block; } li.message > img.person_picture, -li.comment > img.person_picture { +li.comment > img.person_picture, +#session_action > img.person_picture { height: 30px; display: absolute; float: left; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index fb4fc6139737f4a8bb5d99da70acfa11453b03b6..9fa68bb692515a1f5c7ce119aff0b7fcbcdca1e4 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -68,7 +68,7 @@ a header :position relative :margin -2em - :bottom 2em + :bottom 1em :color #555 :background :color #2B2726 @@ -89,7 +89,7 @@ header :text :shadow 0 2px 0 #000 a - :color #fff + :color #666 span.sub_text :color #000 @@ -182,6 +182,7 @@ form #user_name + :display inline :margin :bottom 1em a @@ -234,7 +235,8 @@ img.person_picture :display inline block li.message > img.person_picture, -li.comment > img.person_picture +li.comment > img.person_picture, +#session_action > img.person_picture :height 30px :display absolute :float left