Merge branch 'master' of github.com:diaspora/diaspora_rails

app/views/layouts/application.html.haml

@@ -26,6 +26,7 @@
       .container
         %a#diaspora_text{:href => root_path}
           %img{:src => '/images/diaspora_white.png'}
+          preview
 
         #session_action
           - if user_signed_in?

app/views/shared/_publisher.haml

@@ -3,7 +3,7 @@
     padding: 10px;
     padding-top: 15px;
     padding-bottom: 35px;
-    background-color: rgba( 242, 248, 252, 0.7 );
+    background-color: #F2F8FC;
     border-bottom: 2px #999 solid;
   }
 

public/stylesheets/application.css

@@ -62,11 +62,13 @@ header {
   header #diaspora_text {
     position: absolute;
     border: none;
-    top: 10px; }
+    top: 9px; }
+    header #diaspora_text:hover {
+      color: #316191; }
   header #session_action {
     float: right;
     font-size: 110%;
-    top: 7px;
+    margin-top: 2px;
     padding-right: 10px; }
     header #session_action a {
       color: #cccccc;
@@ -95,14 +97,6 @@ ul#stream_filters {
     ul#stream_filters a:hover {
       color: black; }
 
-#header_below {
-  margin: 0 -2em;
-  -webkit-box-shadow: 0 2px 2px -1px #999999;
-  background-color: #f2f8fc;
-  border-bottom: 1px solid #7e96a6;
-  padding-top: 0.8em;
-  padding-bottom: 0.4em; }
-
 #main {
   width: 100%; }
 

public/stylesheets/sass/application.sass

@@ -68,13 +68,16 @@ header
   #diaspora_text
     :position absolute
     :border none
-    :top 10px
+    :top 9px
+    &:hover 
+      :color #316191
 
   #session_action
     :float right
     :font
       :size 110%
-    :top 7px
+    :margin
+      :top 2px
     a
       :color #ccc
       :border none
@@ -105,16 +108,6 @@ ul#stream_filters
     &:hover
       :color #000
 
-#header_below
-  :margin 0 -2em
-  :-webkit-box-shadow 0 2px 2px -1px #999
-  :background-color #F2F8FC
-  :border
-    :bottom 1px solid #7E96A6
-  :padding
-    :top 0.8em
-    :bottom 0.4em
-
 #main
   :width 100%