DG MS; tweaking top nav and publisher.

app/views/groups/index.html.haml

@@ -1,6 +1,3 @@
-%h1
-  stream for
-  = link_to 'everybody', root_path
 = render "shared/publisher", :group_ids => :all
 %ul#stream
   - for post in @posts

app/views/groups/show.html.haml

@@ -1,7 +1,3 @@
-%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

@@ -55,14 +55,21 @@
 
         = render "shared/group_nav"
 
+      #group_header
+        .container
+          .span-5.last
+            - if @group == :all
+              %h1
+                All Groups
+            - else
+              %h1
+                = @group.name
+
+          .span-19.last
+            = render "shared/publisher", :group_ids => :all
+
     .container
       .span-5.last
-        %h1
-          - if @group == :all
-            = link_to "Everybody", root_path
-          - else
-            = link_to @group.name, @group
-
         = render "shared/group_friends"
 
       .span-19.last

app/views/shared/_group_nav.haml

@@ -17,3 +17,4 @@
   .yo{ :style => "display:none;"}
     #add_group_pane
       = render "groups/new_group"
+

app/views/shared/_publisher.haml

@@ -6,11 +6,12 @@
     %p
       %label{:for => "status_message_message"} Message
       = f.text_area :message, :rows => 2
-      
+
-    %ul.group_selector
+    %ul.group_selector{ :style => "display:none;"}
       going to...
       - for group in @groups
         %li
           = check_box_tag("group_ids[]", group.id, @group == :all || current_group?(group) )
           = group.name
-    = f.submit "Post"
+      
+    = f.submit "Share"

public/stylesheets/application.css

@@ -75,7 +75,7 @@ header {
   color: black;
   background-color: #333333;
   padding: 0;
-  border-bottom: 1px solid #555555; }
+  border-bottom: 1px solid #cccccc; }
   header #diaspora_text {
     position: absolute;
     display: inline;
@@ -98,6 +98,14 @@ header {
     padding-right: 10px; }
     header #session_action a.new_requests {
       color: #df0101; }
+  header #group_header {
+    text-shadow: 0 2px 0 white;
+    background-color: #eeeeee;
+    border-top: 1px solid #555555;
+    height: 85px; }
+    header #group_header h1 {
+      margin-bottom: 0;
+      margin-top: 25px; }
 
 #show_filters {
   z-index: 100;
@@ -120,6 +128,8 @@ ul#stream {
     list-style: none;
     padding: 12px 0;
     border-bottom: 1px solid #eeeeee; }
+  ul#stream > li:first-child {
+    padding-top: 0; }
 
 li.message {
   position: relative;
@@ -313,8 +323,7 @@ label {
   color: #999999;
   position: relative;
   height: 63px;
-  margin-bottom: 10px;
+  margin-top: 20px; }
-  border-bottom: 1px solid #666666; }
   #publisher .avatar {
     float: left;
     margin-right: 15px; }
@@ -326,31 +335,13 @@ label {
     #publisher form input[type='submit'] {
       float: right;
       margin-right: 20px;
-      margin-top: 28px; }
+      margin-top: 26px; }
+      #publisher form input[type='submit'].button {
+        background: #c3ff68; }
   #publisher textarea {
-    width: 485px;
+    width: 600px;
     height: 40px;
     margin-top: 0; }
-  #publisher ul.group_selector {
-    left: 510px;
-    padding: 0;
-    margin: 0;
-    width: 110px;
-    z-index: 10;
-    position: absolute;
-    height: auto;
-    overflow: visible;
-    list-style: none; }
-    #publisher ul.group_selector > li {
-      height: auto;
-      font-size: smaller;
-      padding: 2px;
-      display: none;
-      background-color: #eeeeee; }
-      #publisher ul.group_selector > li:active {
-        background-color: yellow; }
-    #publisher ul.group_selector:hover li {
-      display: block; }
   #publisher .button {
     margin-left: 100px; }
 
@@ -486,11 +477,11 @@ h1.big_text {
           color: #999999; }
     #group_nav ul .selected {
       font-weight: bold;
-      background-color: white;
+      background-color: #eeeeee;
-      border-bottom: 1px solid white;
+      border-bottom: 1px solid #eeeeee;
       color: black; }
       #group_nav ul .selected:hover {
-        background-color: #eeeeee; }
+        background-color: #efefef; }
       #group_nav ul .selected a {
         color: black; }
 

public/stylesheets/sass/application.sass

@@ -82,7 +82,7 @@ header
     :color #333
   :padding 0
   :border
-    :bottom 1px solid #555
+    :bottom 1px solid #ccc
 
   #diaspora_text
     :position absolute
@@ -114,6 +114,20 @@ header
         :color #DF0101
     :padding-right 10px
 
+  #group_header
+    :text-shadow 0 2px 0 #fff
+    :background
+      :color #eee
+    :border
+      :top 1px solid #555
+    :height 85px
+
+    h1
+      :margin
+        :bottom 0
+        :top 25px
+    
+
 #show_filters
   :z-index 100
   :position absolute
@@ -136,6 +150,10 @@ ul#stream
     :border
       :bottom 1px solid #eee
 
+  > li:first-child
+    :padding
+      :top 0
+
 li.message
   :position relative
   :line-height 140%
@@ -385,9 +403,7 @@ label
   :position relative
   :height 63px
   :margin
-    :bottom 10px
+    :top 20px
-  :border
-    :bottom 1px solid #666
 
   .avatar
     :float left
@@ -397,7 +413,7 @@ label
   p
     :position absolute
     :left 0 
-
+  
   form
     :display inline
 
@@ -405,41 +421,14 @@ label
       :float right
       :margin
         :right 20px
-        :top 28px
+        :top 26px
 
   textarea
-    :width 485px
+    :width 600px
     :height 40px
     :margin
       :top 0
 
-  ul.group_selector
-    :left 510px
-    :padding 0
-    :margin 0
-    :width 110px
-    :z-index 10
-    :position absolute
-    :height auto
-    :overflow visible
-    :list
-      :style none
-
-    > li
-      :height auto
-      :font-size smaller
-      :padding 2px
-      :display none
-      :background
-        :color #eee
-
-      &:active
-        :background
-          :color yellow
-
-    &:hover li
-      :display block
-      
   .button
     :margin-left 100px
 
@@ -570,6 +559,7 @@ h1.big_text
   :position relative
   :color #000
 
+
   #group_edit_button
     :display inline
     :margin
@@ -621,19 +611,17 @@ h1.big_text
         a
           :color #999
 
-
-        
     .selected
       :font
         :weight bold
       :background
-        :color #fff
+        :color #eee
       :border
-        :bottom 1px solid #fff
+        :bottom 1px solid #eee
       :color #000
       &:hover
         :background
-          :color #eee
+          :color #efefef
       a
         :color #000
 

public/stylesheets/sass/ui.sass

@@ -48,6 +48,9 @@
     :border
       :top 1px solid #ccc
 
+input.button
+  :padding 5px
+    :bottom 6px
 
 ul.button_set
 

public/stylesheets/ui.css

@@ -32,6 +32,10 @@
     background: -moz-linear-gradient(top, #f0f0f0, #fafafa);
     border-top: 1px solid #cccccc; }
 
+input.button {
+  padding: 5px;
+    padding-bottom: 6px; }
+
 ul.button_set {
   padding-left: 0;
   padding-right: 0; }