diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml index 9cf6ffd86..6c3039aef 100644 --- a/app/views/groups/index.html.haml +++ b/app/views/groups/index.html.haml @@ -1,4 +1,3 @@ -= render "shared/publisher", :group_ids => :all %ul#stream - for post in @posts = render type_partial(post), :post => post unless post.class == Album diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 419510bf1..63ef4736a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -64,7 +64,6 @@ - else %h1 = @group.name - .span-19.last = render "shared/publisher", :group_ids => :all diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml index a5cb32b7b..ad1b3f1d8 100644 --- a/app/views/posts/_debug.haml +++ b/app/views/posts/_debug.haml @@ -1,6 +1,6 @@ #debug_info %h5 DEBUG INFO - #debug_more + #debug_more{ :style => "display:none;" } %ul %li %b params diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index a2e66a60a..775c6076e 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -105,7 +105,7 @@ header { height: 85px; } header #group_header h1 { margin-bottom: 0; - margin-top: 25px; } + margin-top: 27px; } #show_filters { z-index: 100; @@ -292,7 +292,10 @@ ul.comment_set { font-size: larger; } #debug_info { - margin-top: 20px; } + margin-top: 20px; + color: #cccccc; } + #debug_info h5 { + color: #cccccc; } input[type='text'], textarea { font-family: "lucida grande", "sans-serif"; @@ -336,8 +339,6 @@ label { float: right; margin-right: 20px; margin-top: 26px; } - #publisher form input[type='submit'].button { - background: #c3ff68; } #publisher textarea { width: 600px; height: 40px; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index b755aac20..e62dc6881 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -125,8 +125,7 @@ header h1 :margin :bottom 0 - :top 25px - + :top 27px #show_filters :z-index 100 @@ -367,6 +366,10 @@ ul.comment_set #debug_info :margin-top 20px + :color #ccc + + h5 + :color #ccc input[type='text'], textarea