diff --git a/app/views/bookmarks/index.html.haml b/app/views/bookmarks/index.html.haml
index 59e5da9f8..5c0a355d7 100644
--- a/app/views/bookmarks/index.html.haml
+++ b/app/views/bookmarks/index.html.haml
@@ -1,6 +1,6 @@
- title "Bookmarks"
-%div.big_text
+%h1
%p.description= link_to "New Bookmark", new_bookmark_path
%ul#stream
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index d174c52c4..a4fbeeb52 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -1,3 +1,4 @@
+%h3 home
%ul#stream
- for post in @messages
= render "status_messages/pane", :post => post
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index d5e370945..b14a363ff 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,6 +14,17 @@
= csrf_meta_tag
= yield(:head)
+
+ :javascript
+ $(document).ready(function(){
+ $('a').hover(function(){
+ $(this).fadeTo(60, 0.5);
+ }, function(){
+ $(this).fadeTo(80, 1);
+ });
+ });
+
+
%body
%header
%a#diaspora_text{:href => root_path}
@@ -26,20 +37,22 @@
= link_to "login", new_user_session_path
#header_below
- %h1#user_name
- = User.first.email
- %span.description= StatusMessage.my_newest.message
-
- %img{:src => '/images/mocks/bp.jpeg'}
+ - if user_signed_in?
+ %h1#user_name
+ = link_to User.first.email, root_url
+ %span.description= StatusMessage.my_newest.message
- %nav
- %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 "bookmarks", bookmarks_path
- %li= link_to "blogs", blogs_path
- %li= link_to "friends", friends_path
+
+ %img{:src => '/images/mocks/bp.jpeg'}
+
+ %nav
+ %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 "bookmarks", bookmarks_path
+ %li= link_to "blogs", blogs_path
+ %li= link_to "friends", friends_path
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
@@ -47,6 +60,5 @@
%br
%br
%br
- %br
- %br
- = yield
+ #content
+ = yield
diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
index b7951b787..b28edc5fe 100644
--- a/app/views/status_messages/index.html.haml
+++ b/app/views/status_messages/index.html.haml
@@ -1,9 +1,4 @@
-- title "status messages"
-
-%div.big_text
- %p.description= my_latest_message
- %p.description= link_to "New Status Message", new_status_message_path
-
+%h1.big_text= link_to "New Status Message", new_status_message_path
%ul#stream
- for status_message in @status_messages
= render "pane", :post => status_message
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b5c8c340c..ddb7cf192 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6,6 +6,8 @@ body {
a {
color: #cc1e14;
text-decoration: none; }
+ a:hover {
+ color: #cc1e14; }
#flash_notice,
#flash_error,
@@ -78,7 +80,8 @@ ul.nav {
position: absolute;
padding: 0;
margin: 0;
- width: 200px; }
+ width: 200px;
+ margin-top: 300px; }
ul.nav li {
display: block;
padding: 5px 10px;
@@ -104,20 +107,21 @@ ul.nav {
height: 40px;
width: 100%;
padding: 1em;
- padding-top: 4em;
- padding-bottom: 0;
+ padding-top: 40px;
top: 0;
- background-color: rgba(255, 255, 255, 0.8);
+ background-color: rgba(255, 255, 255, 0.9);
margin-left: -2em; }
#header_below img {
+ position: absolute;
width: 200px;
border-radius: 5px; }
+#content {
+ margin-left: 210px; }
+
ul#stream {
margin: 0;
- margin-left: 210px;
padding: 0;
- text-shadow: 0 1px white;
color: #666666;
width: 60%;
min-width: 500px;
@@ -128,11 +132,10 @@ ul#stream {
border-bottom: 1px solid #f1f1f1; }
li.message {
- line-height: 110%;
+ line-height: 140%;
font-size: 120%;
font-family: "Lucida Grande";
- color: #999999;
- text-shadow: none; }
+ color: #999999; }
li.message span.from {
color: black;
font-weight: bold;
@@ -148,18 +151,13 @@ h1 {
line-height: 36px; }
h1 p.description, h1 span.description {
font-weight: normal;
+ font-family: "lucida grande";
color: #999999; }
h1 .big_number {
font-size: 300%;
line-height: 100%; }
- h1 .filters {
- position: absolute;
- right: 0;
- display: inline;
- font-size: 12px;
- font-weight: normal; }
-div.small_text {
+h3 {
position: relative;
font-size: 18px;
font-weight: bold; }
@@ -171,12 +169,6 @@ div.small_text {
width: 100%;
margin-bottom: 1em; }
-#profile_image {
- display: inline block;
- margin-top: 0;
- width: 100px;
- border: 2px solid #eaeaea; }
-
form {
font-size: 430%;
margin: 1em;
@@ -186,12 +178,7 @@ form {
padding: 0.2em;
max-width: 100%; }
-.centered {
- text-align: center; }
-
-.info_pane {
- padding: 1em;
- background-color: #1a1a21;
- color: #f5fafd;
- margin-bottom: 1em;
- border-radius: 2px; }
+#user_name a {
+ color: black; }
+ #user_name a:hover {
+ color: #cc1e14; }
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index f8336dd96..c435819b4 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -7,6 +7,8 @@ a
:color #CC1E14
:text
:decoration none
+ &:hover
+ :color #CC1E14
#flash_notice,
#flash_error,
@@ -95,6 +97,8 @@ ul.nav
:margin 0
:width 200px
+ :margin-top 300px
+
li
:display block
:padding 5px 10px
@@ -128,48 +132,40 @@ ul.nav
:height 40px
:width 100%
:padding 1em
- :top 4em
- :bottom 0
+ :top 40px
:top 0
-
:background
- :color rgba( 255, 255, 255, 0.8)
-
- //:background
- //:color rgba(230, 239, 247, 0.5)
+ :color rgba( 255, 255, 255, 0.9)
:margin
:left -2em
-
img
+ :position absolute
:width 200px
:border-radius 5px
-
-
+#content
+ :margin-left 210px
ul#stream
:margin 0
- :margin-left 210px
:padding 0
- :text-shadow 0 1px #fff
:color #666
+ :width 60%
+ :min-width 500px
+ :max-width 700px
+
> li
:list-style none
:padding 1em
:border
:bottom 1px solid #f1f1f1
- :width 60%
- :min-width 500px
- :max-width 700px
-
li.message
- :line-height 110%
+ :line-height 140%
:font
:size 120%
:family 'Lucida Grande'
:color #999
- :text-shadow none
span.from
:color #000
@@ -182,7 +178,6 @@ li.message
:color #bababa
:font-size 70%
-
h1
:position relative
:font
@@ -193,6 +188,7 @@ h1
p.description, span.description
:font
:weight normal
+ :family 'lucida grande'
:color #999
.big_number
@@ -200,15 +196,7 @@ h1
:size 300%
:line-height 100%
- .filters
- :position absolute
- :right 0
- :display inline
- :font
- :size 12px
- :weight normal
-
-div.small_text
+h3
:position relative
:font
:size 18px
@@ -224,15 +212,6 @@ div.small_text
:margin
:bottom 1em
-
-#profile_image
- :display inline block
- :margin
- :top 0
- :width 100px
- :border 2px solid #eaeaea
-
-
form
:font
:size 430%
@@ -245,15 +224,8 @@ form
:padding 0.2em
:max-width 100%
-
-.centered
- :text-align center
-
-.info_pane
- :padding 1em
- :background
- :color #1A1A21
- :color #f5fafd
- :margin
- :bottom 1em
- :border-radius 2px
+#user_name
+ a
+ :color #000
+ &:hover
+ :color #CC1E14