moved publisher down.wn. header is now a dark grey instead of black.

app/views/groups/index.html.haml

@@ -1,3 +1,7 @@
+%h1
+  stream for
+  = link_to 'everybody', root_path
+= render "shared/publisher", :group_ids => :all
 %ul#stream
   - for post in @posts
     = render type_partial(post), :post => post unless post.class == Album

app/views/groups/show.html.haml

@@ -1,3 +1,7 @@
+%h1
+  stream for
+  = link_to @group.name, @group
+= render "shared/publisher", :group_ids => :all
 %ul#stream
   - for post in @posts
     = render type_partial(post), :post => post

app/views/layouts/application.html.haml

@@ -51,17 +51,10 @@
             %li.settings= link_to "settings", edit_user_path(current_user)
             %li.logout= link_to "logout", destroy_user_session_path
 
-    #sub_header
-      .container
-        .span-19.append-5.last
-          = render "shared/publisher", :group_ids => :all
         = render "shared/group_nav"
 
     .container
-      .span-19.last
-        = yield
-
-      .span-4.prepend-1.last
+      .span-5.last
         %h1
           - if @group == :all
             = link_to "Everybody", root_path
@@ -70,6 +63,9 @@
 
         = render "shared/group_friends"
 
-      .span-24.last
+      .span-19.last
+        = yield
+
+      .span-19.prepend-5.last
         = render "posts/debug"
 

public/stylesheets/application.css

@@ -71,11 +71,11 @@ header {
   z-index: 4;
   position: relative;
   margin: -2em;
-    margin-bottom: 0;
+    margin-bottom: 2em;
   color: black;
   background-color: #333333;
-  border-bottom: 1px solid #666666;
-  padding: 0; }
+  padding: 0;
+  border-bottom: 1px solid #555555; }
   header #diaspora_text {
     position: absolute;
     display: inline;
@@ -83,10 +83,9 @@ header {
     font-size: 16px;
     border: none;
     color: white;
-    text-shadow: 0 2px 0 black;
     top: 3px; }
     header #diaspora_text a {
-      color: #666666; }
+      color: #999999; }
     header #diaspora_text a:hover {
       color: white;
       background: none; }
@@ -100,13 +99,6 @@ header {
     header #session_action a.new_requests {
       color: #df0101; }
 
-#sub_header {
-  border-bottom: 1px solid #444444;
-  margin: 0 -2em;
-  padding: 0.5em 0;
-  background-color: #111111;
-  margin-bottom: 2em; }
-
 #show_filters {
   z-index: 100;
   position: absolute;
@@ -318,7 +310,6 @@ label {
   font-weight: normal; }
 
 #publisher {
-  padding-top: 20px;
   padding-bottom: 20px;
   color: #999999;
   position: relative;
@@ -427,8 +418,9 @@ h1.big_text {
 #content_bottom {
   position: relative;
   line-height: 36px;
-  margin-top: 25px;
-  margin-bottom: 25px;
+  margin: 0 25px;
+    margin-top: 25px;
+    margin-bottom: 25px;
   min-height: 36px;
   border-top: 1px solid #999999;
   border-bottom: 2px solid #eeeeee; }
@@ -458,19 +450,18 @@ h1.big_text {
 #group_nav {
   color: black; }
   #group_nav ul {
-    margin: 0;
-      margin-bottom: -5px;
+    margin-bottom: 0;
     padding: 0;
-      padding-left: 65px;
+      padding-bottom: 0px;
+      padding-top: 35px;
     list-style: none;
     font-size: 14px; }
     #group_nav ul > li {
-      border-radius: 3px 3px 0 0;
-      background-color: #333333;
+      background-color: #444444;
       display: inline;
       margin-right: 0.5em;
-      padding: 0.3em 0.5em;
-      border: 1px solid #444444; }
+      padding: 3px 8px;
+      border: 1px solid #555555; }
       #group_nav ul > li:hover {
         background-color: #444444; }
         #group_nav ul > li:hover a {
@@ -487,12 +478,14 @@ h1.big_text {
       #group_nav ul .⚙ a {
         color: black; }
     #group_nav ul .selected {
-      opacity: 1;
+      font-weight: bold;
       background-color: white;
       border-bottom: 1px solid white;
       color: black; }
       #group_nav ul .selected:hover {
         background-color: #eeeeee; }
+      #group_nav ul .selected a {
+        color: black; }
       #group_nav ul .selected .⚙ a {
         color: #333333; }
 

public/stylesheets/sass/application.sass

@@ -76,13 +76,13 @@ header
   :z-index 4
   :position relative
   :margin -2em
-    :bottom 0
+    :bottom 2em
   :color #000
   :background
     :color #333
-  :border
-    :bottom 1px solid #666
   :padding 0
+  :border
+    :bottom 1px solid #555
 
   #diaspora_text
     :position absolute
@@ -92,12 +92,10 @@ header
       :size 16px
     :border none
     :color #fff
-    :text
-      :shadow 0 2px 0 #000
     :top 3px
 
     a
-      :color #666
+      :color #999
 
     a:hover
       :color #fff
@@ -116,16 +114,6 @@ header
         :color #DF0101
     :padding-right 10px
 
-#sub_header
-  :border
-    :bottom 1px solid #444
-  :margin 0 -2em
-  :padding 0.5em 0
-  :background
-    :color #111
-  :margin
-    :bottom 2em
-
 #show_filters
   :z-index 100
   :position absolute
@@ -394,7 +382,6 @@ label
 
 #publisher
   :padding
-    :top 20px
     :bottom 20px
   :color #999
   :position relative
@@ -541,7 +528,7 @@ h1.big_text
   :position relative
   :line-height 36px
 
-  :margin
+  :margin 0 25px
     :top 25px
     :bottom 25px 
 
@@ -581,24 +568,24 @@ h1.big_text
 #group_nav
   :color #000
   ul
-    :margin 0
-      :bottom -5px
+    :margin
+      :bottom 0
     :padding 0
-      :left 65px
+      :bottom 0px
+      :top 35px
     :list
       :style none
     :font
       :size 14px
     > li
-      :border-radius 3px 3px 0 0
       :background
-        :color #333
+        :color #444
       :display inline
       :margin
         :right 0.5em
-      :padding 0.3em 0.5em
+      :padding 3px 8px
 
-      :border 1px solid #444
+      :border 1px solid #555
 
       &:hover
         :background
@@ -621,7 +608,8 @@ h1.big_text
         :color #000
         
     .selected
-      :opacity 1
+      :font
+        :weight bold
       :background
         :color #fff
       :border
@@ -630,6 +618,9 @@ h1.big_text
       &:hover
         :background
           :color #eee
+      a
+        :color #000
+
       .⚙
         a
           :color #333