Skip to content
Snippets Groups Projects
Commit 0c392a0c authored by danielvincent's avatar danielvincent
Browse files

moved nav to bottom header

parent d1630b6c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/views/dashboard/index.html.haml
+ 21
− 30
View file @ 0c392a0c
%div.big_text#info_top
welcome home, daniel.
%p.description
this is your diaspora dashboard, a place where you can catch a
= link_to "glimpse", "#"
of what all your friends are doing.
/%div.big_text#info_top
/welcome home, daniel.
/%p.description
/this is your diaspora dashboard, a place where you can catch a
/= 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"}
.span-16.append-2.last
%div.big_text
requests
%div.big_text
recent activity
%div.big_text
%div.big_number= link_to "30", "#"
new requests
/%div#publish
/- form_for 'StatusMessage' do |f|
/= f.text_field :thought
.prepend-2.span-16.last
%div{ :style => "padding: 1em" }
%ul#stream
- for post in @posts
= render "status_messages/pane", :post => post
%div.big_text
updates
/%div#publish
/- form_for 'update' do |f|
/= f.text_field :thought
.span-6.last
%div.big_text
requests
%ul#stream
- for post in @posts
%li
= render "status_messages/pane", :post => post
%div.big_text
%div.big_number= link_to "30", "#"
new requests
app/views/layouts/application.html.haml
+ 9
− 8
View file @ 0c392a0c
......@@ -20,21 +20,22 @@
#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?
= link_to "log out", destroy_user_session_path
= link_to User.first.email, destroy_user_session_path
- else
= link_to "login", new_user_session_path
#header_below
.container
%div.big_text#info_top
daniel grippi posted a new update
%p.description
let's take this into overdrive.
%ul.nav
%li= link_to "home", root_path
%li= link_to "friends", friends_path
.container
- if show_title?
......
app/views/status_messages/_pane.html.haml
+ 9
− 3
View file @ 0c392a0c
%sp.message
%sp.from= post.owner
= post.message
%li
.span-2.last
%img{:src => "/images/mocks/user_pic.jpeg", :height => "35px", :class => "avatar"}
.span-13.last
%sp.message
%sp.from= post.owner
= post.message
%br
%sp.time= "#{time_ago_in_words(post.updated_at)} ago"
public/images/bp.jpeg deleted 100644 → 0
+ 0
− 0
View file @ d1630b6c
public/images/bp.jpeg

261 KiB

public/images/mocks/user_pic.jpeg 0 → 100644
+ 0
− 0
View file @ 0c392a0c
public/images/mocks/user_pic.jpeg

6.48 KiB

public/stylesheets/application.css
+ 61
− 44
View file @ 0c392a0c
......@@ -52,46 +52,55 @@ h4 {
margin: 0; }
#header {
min-height: 35px;
height: 30px;
color: white;
font-size: 110%;
background-color: #1a1a21;
border-bottom: 1px solid white; }
border-bottom: 1px solid white;
padding-top: 5px; }
#header #huge_star {
position: absolute;
font-size: 80px;
top: -25px; }
font-family: "helvetica neue", "helvetica", "arial", "sans-serif";
font-size: 60px;
top: -15px; }
#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%;
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;
color: #999999; }
#header ul.nav a:hover {
color: #cccccc; }
float: right;
font-size: 110%;
margin-top: 1px; }
#header #session_action a {
color: #cccccc;
border: none; }
#header #session_action a:hover {
color: white; }
ul.nav {
padding: 0;
margin: 0;
font-size: 130%;
position: absolute;
margin-top: -62px; }
ul.nav li {
display: inline;
margin-right: 1em;
padding: 5px 10px;
background: #f2f8fc;
border: 1px solid white;
border-bottom: none; }
ul.nav li:first-child {
background: white; }
ul.nav li:last-child {
margin: 0; }
ul.nav a {
border-bottom: none;
color: #b1cfe3; }
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; }
text-align: right; }
#left_pane {
background-color: #e6eff7;
......@@ -105,33 +114,37 @@ ul#stream {
ul#stream > li {
list-style: none;
padding: 2em;
-webkit-box-shadow: 0 4px 5px -5px #999999; }
ul#stream > li:first-child {
padding-top: 0; }
-webkit-box-shadow: 0 4px 5px -5px #999999;
min-height: 40px; }
ul#stream > li img.avatar {
background: white;
padding: 2px;
border: 1px solid #eaeaea;
border-radius: 3px; }
sp.message {
font-size: 110%;
letter-spacing: 0.1em; }
font-size: 120%;
color: #999999;
text-shadow: none; }
sp.message sp.from {
color: #999999; }
color: black; }
sp.message sp.time {
color: #cccccc;
font-size: 80%; }
div.big_text {
font-size: 24px;
font-weight: bold;
line-height: 36px;
margin-bottom: 2em; }
line-height: 36px; }
div.big_text p.description {
font-weight: normal;
color: #999999; }
div.big_text .big_number {
font-size: 300%; }
font-size: 300%;
line-height: 100%; }
div.big_text .big_number a {
border: none; }
#info_top {
margin-top: -130px;
margin-bottom: 50px; }
#publish input {
font-size: 30px;
padding: 7px;
......@@ -139,6 +152,10 @@ div.big_text {
width: 90%; }
#profile_image {
margin-top: 1em;
width: 240px;
margin-top: 0;
width: 100px;
border: 2px solid #eaeaea; }
.yellow {
background: #fffdb8;
border: 1px solid #e3e08d; }
public/stylesheets/sass/application.sass
+ 64
− 41
View file @ 0c392a0c
......@@ -58,7 +58,7 @@ h4
:margin 0
#header
:min-height 35px
:height 30px
:color #fff
:font
:size 110%
......@@ -66,58 +66,72 @@ h4
:color #1A1A21
:border
:bottom 1px solid #fff
:padding
:top 5px
#huge_star
:position absolute
:font
:size 80px
:family 'helvetica neue', 'helvetica', 'arial', 'sans-serif'
:size 60px
//:background
//:color #ff3378
:top -25px
:top -15px
#diaspora_text
:border none
#session_action
:display none
:float right
:font-size 110%
:margin-top 1px
a
:color #ccc
:border none
&:hover
:color #fff
ul.nav
:padding 0
ul.nav
:padding 0
:margin 0
:font
:size 130%
:position absolute
:margin-top -62px
li
:display inline
:margin
:right 1em
:padding 5px 10px
:background #F2F8FC
:border 1px solid #fff
:border-bottom none
li:first-child
:background #fff
li:last-child
:margin 0
:margin-top 6px
:display block
:font
:size 130%
:float right
a
:border
:bottom none
:color #B1CFE3
&:hover
:color #ccc
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
......@@ -134,17 +148,27 @@ ul#stream
:list-style none
:padding 2em
:-webkit-box-shadow 0 4px 5px -5px #999
> li:first-child
:padding-top 0
:min-height 40px
img.avatar
background: #fff
padding: 2px
:border 1px solid #eaeaea
:border-radius 3px
sp.message
:font
:size 110%
:letter-spacing 0.1em
:size 120%
:color #999
:text-shadow none
sp.from
:color #999
:color #000
sp.time
:color #ccc
:font-size 80%
div.big_text
......@@ -152,7 +176,6 @@ div.big_text
:size 24px
:weight bold
:line-height 36px
:margin-bottom 2em
p.description
:font
......@@ -162,13 +185,10 @@ div.big_text
.big_number
:font
:size 300%
:line-height 100%
a
:border none
#info_top
:margin
:top -130px
:bottom 50px
#publish
input
......@@ -181,8 +201,11 @@ div.big_text
#profile_image
:margin
:top 1em
:width 240px
:top 0
:width 100px
:border 2px solid #eaeaea
.yellow
:background #FFFDB8
:border 1px solid #E3E08D
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment