moved publisher

app/views/dashboards/index.html.haml

@@ -3,7 +3,9 @@
     = link_to current_user.real_name, root_path
     %span.description
       = my_latest_message
+
 %h1= title_for_page
+= render "shared/publisher"
 %ul#stream
   - for post in @posts
     = render type_partial(post), :post => post

app/views/layouts/application.html.haml

@@ -39,9 +39,13 @@
             = link_to "logout", destroy_user_session_path
           - else
             = link_to "login", new_user_session_path
+    .container
+      = link_to "photos", albums_path
+      |
+      = link_to "ostatus", ostatus_path
+      %br
+      %br
 
-
-    = render "shared/publisher"
     .container
       .span-24.last
         .span-3.append-1.last

app/views/shared/_publisher.haml

@@ -1,13 +1,10 @@
 #publisher
-  .container
   %sp
     Post a new 
   %ul#publisher_content_pickers
-      %li{ :class => "status_message" }= link_to "status message", "#"
+    %li{ :class => "status_message selected" }= link_to "status message", "#"
     %li{ :class => "bookmark" }= link_to "bookmark", "#"
     %li{ :class => "blog" }= link_to "blog", "#"
-      %li= link_to "photos", albums_path
-      %li= link_to "ostatus", ostatus_path
 
   #publisher_form
     = form_for StatusMessage.new, :remote => true do |f|

public/javascripts/publisher.js

@@ -14,9 +14,6 @@
 
         $(this).toggleClass("selected");
         $(form_id).delay(50).fadeIn(200);
-      } else {
-        $("#publisher_content_pickers").children("li").removeClass("selected");
-        $("#publisher_form form").fadeOut(200);
       }
     }
   });

public/stylesheets/application.css

@@ -64,18 +64,14 @@ a {
 header {
   position: relative;
   margin: -2em;
-    margin-bottom: 0;
-  height: 50px;
+    margin-bottom: 2em;
   color: #555555;
-  background-color: black;
-  background-color: -webkit-gradient(linear, 0% 0%, 0% 55%, from(#474747), to(black));
-  background-color: #414545;
   background-color: #2b2726;
   border-bottom: 1px solid #444444;
-  padding-top: 20px;
-  box-shadow: 0 2px 10px black;
-  -webkit-box-shadow: 0 2px 10px black;
-  -moz-box-shadow: 0 2px 10px black; }
+  padding: 8px 0;
+  box-shadow: 0 2px 2px black;
+  -webkit-box-shadow: 0 2px 2px black;
+  -moz-box-shadow: 0 2px 2px black; }
   header #diaspora_text {
     font-family: "BrandonGrotesqueLightRegular";
     font-size: 24px;
@@ -269,42 +265,31 @@ label {
   left: 0.48em; }
 
 #publisher {
-  padding: 0.5em 0;
   background-color: #f2f8fc;
-  background-color: #333333;
-  border-bottom: 1px #eaeaea solid;
-  margin: 0 -2em;
-    margin-bottom: 2em;
+  background-color: rgba(10, 81, 109, 0.05);
+  border-bottom: 2px #999999 solid;
   color: #999999;
-  box-shadow: 0 2px 20px #999999;
-  -webkit-box-shadow: 0 2px 20px #999999;
-  -moz-box-shadow: 0 2px 20px #999999; }
-  #publisher sp {
-    text-shadow: 0 2px 0 black; }
-  #publisher textarea, #publisher input {
-    box-shadow: 0 0px 3px black;
-    -webkit-box-shadow: 0 0px 3px black;
-    -moz-box-shadow: 0 0px 3px #999999; }
+  padding: 20px 1em;
+    padding-top: 10px; }
 
 #new_blog,
-#new_bookmark,
-#new_status_message {
+#new_bookmark {
   display: none; }
 
 ul#publisher_content_pickers {
   display: inline;
   margin: 0 -10px;
   padding: 0;
-  margin-left: 10px;
-  text-shadow: 0 2px 0 black; }
+  margin-left: 10px; }
 
 ul#publisher_content_pickers li {
   display: inline;
   padding: 5px 10px;
   margin-right: 5px; }
 
-#publisher.selected {
-  border-bottom: 3px solid #999999; }
+#publisher .selected {
+  border-bottom: 3px solid #999999;
+  background-color: rgba(10, 81, 109, 0.1); }
 
 #image_picker .small_photo {
   height: 100px;

public/stylesheets/sass/application.sass

@@ -68,21 +68,16 @@ a
 header
   :position relative
   :margin -2em
-    :bottom 0
-  :height 50px
+    :bottom 2em
   :color #555
   :background
-    :color #000
-    :color -webkit-gradient(linear, 0% 0%, 0% 55%, from(#474747), to(#000000))
-    :color rgb(65,69,69)
     :color #2B2726
   :border
     :bottom 1px solid #444
-  :padding
-    :top 20px
-  :box-shadow 0 2px 10px #000
-  :-webkit-box-shadow 0 2px 10px #000
-  :-moz-box-shadow 0 2px 10px #000
+  :padding 8px 0
+  :box-shadow 0 2px 2px #000
+  :-webkit-box-shadow 0 2px 2px #000
+  :-moz-box-shadow 0 2px 2px #000
 
   #diaspora_text
     :font
@@ -317,30 +312,17 @@ label
   :left 0.48em
 
 #publisher
-  :padding 0.5em 0
   :background
     :color #F2F8FC
-    :color #333
+    :color rgba(10,81,109,0.05)
   :border
-    :bottom 1px #eaeaea solid
-  :margin 0 -2em
-    :bottom 2em
+    :bottom 2px #999 solid
   :color #999
-  :box-shadow 0 2px 20px #999
-  :-webkit-box-shadow 0 2px 20px #999
-  :-moz-box-shadow 0 2px 20px #999
-
-  sp
-    :text-shadow 0 2px 0 #000
-
-  textarea, input
-    :box-shadow 0 0px 3px #000
-    :-webkit-box-shadow 0 0px 3px #000
-    :-moz-box-shadow 0 0px 3px #999
+  :padding 20px 1em
+    :top 10px
 
 #new_blog, 
-#new_bookmark,
-#new_status_message
+#new_bookmark
   :display none
 
 ul#publisher_content_pickers
@@ -349,7 +331,6 @@ ul#publisher_content_pickers
   :padding 0
   :margin
     :left 10px
-  :text-shadow 0 2px 0 #000
 
 ul#publisher_content_pickers li
   :display inline
@@ -357,9 +338,11 @@ ul#publisher_content_pickers li
   :margin
     :right 5px
 
-#publisher.selected
+#publisher .selected
   :border
     :bottom 3px solid #999
+  :background
+    :color rgba(10,81,109,0.1)
 
 #image_picker
   .small_photo