diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index 5dd72d92e..bd615a131 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -6,20 +6,12 @@
= link_to "glimpse", "#"
of what all your friends are doing.
-
-
-
-
.span-6.last
%div{ :style => "padding: 1em" }
%div.big_text
daniel grippi
%img{:src=>"/images/bp.jpeg", :id => "profile_image"}
-
-
-
-
%div.big_text
requests
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 5bb8a970b..bc06d3ce0 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -20,6 +20,13 @@
#huge_star *
%a#diaspora_text{:href => root_path}
/%img{:src => '/images/diaspora_white.png'}
+ %ul.nav
+ %li= link_to "home", root_path
+ %li= link_to "users", users_path
+ %li= link_to "status messages", status_messages_path
+ %li= link_to "friends", friends_path
+ %li= link_to "bookmarks", bookmarks_path
+ %li= link_to "blogs", blogs_path
#session_action
- if user_signed_in?
@@ -27,13 +34,7 @@
- else
= link_to "login", new_user_session_path
- /%ul.nav
- /%li= link_to "home", root_path
- /%li= link_to "users", users_path
- /%li= link_to "status messages", status_messages_path
- /%li= link_to "friends", friends_path
- /%li= link_to "bookmarks", bookmarks_path
- /%li= link_to "blogs", blogs_path
+ #header_below
.container
- if show_title?
diff --git a/app/views/status_messages/_pane.html.haml b/app/views/status_messages/_pane.html.haml
index a19d05f38..52d2c6a0b 100644
--- a/app/views/status_messages/_pane.html.haml
+++ b/app/views/status_messages/_pane.html.haml
@@ -1,5 +1,4 @@
-%sp.from
- = post.owner
- %sp{:style => "opacity: 0.7"} said
-%sp.message= post.message
+%sp.message
+ %sp.from= post.owner
+ = post.message
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1875e2227..9b9f41f9f 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1,3 +1,6 @@
+body {
+ font-family: "helvetica", "arial", "sans-serif"; }
+
a {
color: #cc1e14;
text-decoration: none;
@@ -49,31 +52,46 @@ h4 {
margin: 0; }
#header {
- padding-top: 1em;
- padding-bottom: 5em;
+ min-height: 35px;
color: white;
- font-size: 120%;
+ font-size: 110%;
background-color: #1a1a21;
- border-bottom: 170px solid #e6eff7; }
+ border-bottom: 1px solid white; }
#header #huge_star {
position: absolute;
- font-size: 300px;
- top: -103px; }
+ font-size: 80px;
+ top: -25px; }
#header #diaspora_text {
border: none; }
#header #session_action {
+ display: none;
float: right; }
#header ul.nav {
padding: 0;
margin: 0;
+ margin-top: 6px;
display: block;
font-size: 130%;
- bottom: 0; }
+ float: right; }
#header ul.nav li {
display: inline;
margin-right: 1em; }
+ #header ul.nav li:last-child {
+ margin: 0; }
#header ul.nav a {
- border-bottom: none; }
+ border-bottom: none;
+ color: #999999; }
+ #header ul.nav a:hover {
+ color: #cccccc; }
+
+#header_below {
+ background-color: #e6eff7;
+ min-height: 150px;
+ line-height: 150px;
+ border-bottom: 0;
+ position: relative;
+ text-align: right;
+ z-index: -2; }
#left_pane {
background-color: #e6eff7;
@@ -87,22 +105,15 @@ ul#stream {
ul#stream > li {
list-style: none;
padding: 2em;
- -webkit-box-shadow: 0 4px 5px -5px black; }
+ -webkit-box-shadow: 0 4px 5px -5px #999999; }
ul#stream > li:first-child {
padding-top: 0; }
sp.message {
- font-size: 150%;
- letter-spacing: 0.13em; }
-
-sp.from {
- font-size: 120%;
- display: block;
- color: #999999;
+ font-size: 110%;
letter-spacing: 0.1em; }
-
-body {
- font-family: "helvetica", "arial", "sans-serif"; }
+ sp.message sp.from {
+ color: #999999; }
div.big_text {
font-size: 24px;
@@ -118,7 +129,7 @@ div.big_text {
border: none; }
#info_top {
- margin-top: -140px;
+ margin-top: -130px;
margin-bottom: 50px; }
#publish input {
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index ef9b406a8..f9e8eeb27 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1,3 +1,7 @@
+body
+ :font
+ :family 'helvetica', 'arial', 'sans-serif'
+
a
:color #CC1E14
:text
@@ -54,51 +58,66 @@ h4
:margin 0
#header
- :padding
- :top 1em
- :bottom 5em
+ :min-height 35px
:color #fff
-
:font
- :size 120%
-
+ :size 110%
:background
:color #1A1A21
-
:border
- :bottom 170px solid #e6eff7
+ :bottom 1px solid #fff
#huge_star
:position absolute
:font
- :size 300px
+ :size 80px
//:background
//:color #ff3378
- :top -103px
+ :top -25px
#diaspora_text
:border none
#session_action
+ :display none
:float right
ul.nav
:padding 0
:margin 0
+ :margin-top 6px
:display block
:font
:size 130%
- :bottom 0
+ :float right
li
:display inline
:margin
:right 1em
+ li:last-child
+ :margin 0
a
:border
:bottom none
+ :color #999
+
+ &:hover
+ :color #ccc
+
+
+#header_below
+ :background
+ :color #e6eff7
+ :min-height 150px
+ :line-height 150px
+ :border-bottom 0
+ :position relative
+ :text-align right
+ :z-index -2
+
#left_pane
:background
@@ -114,29 +133,20 @@ ul#stream
> li
:list-style none
:padding 2em
- :-webkit-box-shadow 0 4px 5px -5px #000
+ :-webkit-box-shadow 0 4px 5px -5px #999
> li:first-child
:padding-top 0
sp.message
:font
- :size 150%
- :letter-spacing 0.13em
+ :size 110%
+ :letter-spacing 0.1em
-sp.from
- :font
- :size 120%
- :display block
- :color #999
- :letter-spacing 0.1em
+ sp.from
+ :color #999
-body
-
- :font
- :family 'helvetica', 'arial', 'sans-serif'
-
div.big_text
:font
:size 24px
@@ -157,7 +167,7 @@ div.big_text
#info_top
:margin
- :top -140px
+ :top -130px
:bottom 50px
#publish