nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more shuffling

Browse source
This commit is contained in:
danielvincent 2010-06-19 14:44:08 -07:00
parent 0c392a0cce
commit df2b9d6ad4
8 changed files with 176 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/views/dashboard/index.html.haml
View file

@ -6,24 +6,36 @@
/= link_to "glimpse", "#" /= link_to "glimpse", "#"
/of what all your friends are doing. /of what all your friends are doing.
.span-16.append-2.last .span-15.append-2.last
%div.small_text
what's crackalackin', daniel?
%div#publish
- form_for 'StatusMessage' do |f|
= f.text_field :thought
%div.big_text %div.big_text
recent activity recent activity
%div.filters
= link_to "displaying all", "#"
/%div#publish
/- form_for 'StatusMessage' do |f|
/= f.text_field :thought
%ul#stream %ul#stream
- for post in @posts - for post in @posts
= render "status_messages/pane", :post => post = render "status_messages/pane", :post => post
.span-6.last .span-7.last
%div.big_text
requests
%div.big_text %div.info_pane
%div.big_number= link_to "30", "#" %img{:src => "/images/mocks/bp.jpeg", :width => '100%', :class => "profile_image"}
new requests %div.big_text
daniel grippi
%div.info_pane
%div.big_text
requests
%div.big_text
%div.big_number= link_to "30", "#"
new requests

25
app/views/devise/sessions/new.html.haml
View file

@ -1,16 +1,15 @@
%h2 Sign in %div.centered
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %div.big_text
%p sign in
= f.label :email
%br/ = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
= f.text_field :email = f.text_field :email
%p %br
= f.label :password
%br/
= f.password_field :password = f.password_field :password
- if devise_mapping.rememberable?
%p %p
= f.check_box :remember_me - if devise_mapping.rememberable?
= f.label :remember_me = f.check_box :remember_me
%p= f.submit "Sign in" = f.label :remember_me
= render :partial => "devise/shared/links" %br
= f.submit "Sign in"
= render :partial => "devise/shared/links"

7
app/views/layouts/application.html.haml
View file

@ -19,7 +19,7 @@
.container .container
#huge_star * #huge_star *
%a#diaspora_text{:href => root_path} %a#diaspora_text{:href => root_path}
/%img{:src => '/images/diaspora_white.png'} %img{:src => '/images/diaspora_white.png'}
#session_action #session_action
- if user_signed_in? - if user_signed_in?
@ -29,12 +29,9 @@
#header_below #header_below
.container .container
%div.big_text#info_top
daniel grippi posted a new update
%p.description
let's take this into overdrive.
%ul.nav %ul.nav
%li= link_to "home", root_path %li= link_to "home", root_path
%li= link_to "status messages", status_messages_path
%li= link_to "friends", friends_path %li= link_to "friends", friends_path
.container .container

15
app/views/status_messages/_pane.html.haml
View file

@ -1,10 +1,9 @@
%li %li
.span-2.last %img{:src => "/images/mocks/user_pic.jpeg", :class => "avatar"}
%img{:src => "/images/mocks/user_pic.jpeg", :height => "35px", :class => "avatar"} %sp.message
.span-13.last %sp.from= link_to post.owner, "#"
%sp.message /%sp.from Daniel Grippi
%sp.from= post.owner = post.message
= post.message %br
%br %sp.time= "#{time_ago_in_words(post.updated_at)} ago"
%sp.time= "#{time_ago_in_words(post.updated_at)} ago"

BIN
public/images/diaspora_white.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
public/images/mocks/bp.jpeg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 261 KiB

87
public/stylesheets/application.css
View file

@ -3,8 +3,7 @@ body {
a { a {
color: #cc1e14; color: #cc1e14;
text-decoration: none; text-decoration: none; }
border-bottom: dotted 1px #999999; }
h1, h1,
h2, h2,
@ -56,15 +55,18 @@ h4 {
color: white; color: white;
font-size: 110%; font-size: 110%;
background-color: #1a1a21; background-color: #1a1a21;
border-bottom: 1px solid white; border-bottom: 2px solid white;
padding-top: 5px; } padding-top: 5px; }
#header #huge_star { #header #huge_star {
display: none;
position: absolute; position: absolute;
font-family: "helvetica neue", "helvetica", "arial", "sans-serif"; font-family: "helvetica neue", "helvetica", "arial", "sans-serif";
font-size: 60px; font-size: 60px;
top: -15px; } top: -15px; }
#header #diaspora_text { #header #diaspora_text {
border: none; } position: absolute;
border: none;
top: 8px; }
#header #session_action { #header #session_action {
float: right; float: right;
font-size: 110%; font-size: 110%;
@ -76,20 +78,22 @@ h4 {
color: white; } color: white; }
ul.nav { ul.nav {
position: absolute;
padding: 0; padding: 0;
margin: 0; margin: 0;
font-size: 130%; font-size: 130%;
position: absolute; bottom: 2px; }
margin-top: -62px; }
ul.nav li { ul.nav li {
display: inline; display: inline;
margin-right: 1em; margin-right: 0.5em;
padding: 5px 10px; padding: 5px 10px;
background: #f2f8fc; background: #f2f8fc;
border: 1px solid white; border: 1px solid white;
border-bottom: none; } border-bottom: none; }
ul.nav li:first-child { ul.nav li:first-child {
background: white; } background: white; }
ul.nav li:first-child a {
color: #1a1a21; }
ul.nav li:last-child { ul.nav li:last-child {
margin: 0; } margin: 0; }
ul.nav a { ul.nav a {
@ -99,8 +103,11 @@ ul.nav {
color: #cccccc; } color: #cccccc; }
#header_below { #header_below {
position: relative;
background-color: #e6eff7; background-color: #e6eff7;
text-align: right; } text-align: right;
height: 70px;
margin-bottom: 40px; }
#left_pane { #left_pane {
background-color: #e6eff7; background-color: #e6eff7;
@ -113,26 +120,32 @@ ul#stream {
color: #666666; } color: #666666; }
ul#stream > li { ul#stream > li {
list-style: none; list-style: none;
padding: 2em; padding: 1em;
-webkit-box-shadow: 0 4px 5px -5px #999999; border-bottom: 1px solid #f1f1f1; }
min-height: 40px; }
ul#stream > li img.avatar { ul#stream > li img.avatar {
background: white; width: 45px;
padding: 2px; background: white; }
border: 1px solid #eaeaea;
border-radius: 3px; }
sp.message { sp.message {
position: absolute;
float: left;
margin-left: 10px;
margin-top: -2px;
line-height: 17px;
font-size: 120%; font-size: 120%;
color: #999999; font-family: "Lucida Grande";
text-shadow: none; } color: #666666;
text-shadow: none;
width: 480px; }
sp.message sp.from { sp.message sp.from {
color: black; } color: black;
font-weight: bold; }
sp.message sp.time { sp.message sp.time {
color: #cccccc; color: #bababa;
font-size: 80%; } font-size: 70%; }
div.big_text { div.big_text {
position: relative;
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
line-height: 36px; } line-height: 36px; }
@ -142,20 +155,42 @@ div.big_text {
div.big_text .big_number { div.big_text .big_number {
font-size: 300%; font-size: 300%;
line-height: 100%; } line-height: 100%; }
div.big_text .big_number a { div.big_text .filters {
border: none; } position: absolute;
right: 0;
display: inline;
font-size: 12px;
font-weight: normal; }
div.small_text {
position: relative;
font-size: 18px;
font-weight: bold; }
#publish input { #publish input {
font-size: 30px; font-size: 30px;
padding: 7px; padding: 7px;
border-radius: 5px; border-radius: 5px;
width: 90%; } width: 100%;
margin-bottom: 1em; }
#profile_image { #profile_image {
display: inline block;
margin-top: 0; margin-top: 0;
width: 100px; width: 100px;
border: 2px solid #eaeaea; } border: 2px solid #eaeaea; }
.yellow { form {
background: #fffdb8; font-size: 130%; }
border: 1px solid #e3e08d; } form input {
font-size: 150%;
padding: 0.2em; }
.centered {
text-align: center; }
.info_pane {
padding: 1em;
background-color: #1a1a21;
color: #f5fafd;
margin-bottom: 1em; }

97
public/stylesheets/sass/application.sass
View file

@ -6,8 +6,6 @@ a
:color #CC1E14 :color #CC1E14
:text :text
:decoration none :decoration none
:border
:bottom dotted 1px #999
h1, h1,
h2, h2,
@ -65,12 +63,13 @@ h4
:background :background
:color #1A1A21 :color #1A1A21
:border :border
:bottom 1px solid #fff :bottom 2px solid #fff
:padding :padding
:top 5px :top 5px
#huge_star #huge_star
:display none
:position absolute :position absolute
:font :font
:family 'helvetica neue', 'helvetica', 'arial', 'sans-serif' :family 'helvetica neue', 'helvetica', 'arial', 'sans-serif'
@ -80,7 +79,9 @@ h4
:top -15px :top -15px
#diaspora_text #diaspora_text
:position absolute
:border none :border none
:top 8px
#session_action #session_action
@ -95,17 +96,17 @@ h4
ul.nav ul.nav
:position absolute
:padding 0 :padding 0
:margin 0 :margin 0
:font :font
:size 130% :size 130%
:position absolute :bottom 2px
:margin-top -62px
li li
:display inline :display inline
:margin :margin
:right 1em :right 0.5em
:padding 5px 10px :padding 5px 10px
:background #F2F8FC :background #F2F8FC
:border 1px solid #fff :border 1px solid #fff
@ -113,6 +114,8 @@ ul.nav
li:first-child li:first-child
:background #fff :background #fff
a
:color #1A1A21
li:last-child li:last-child
:margin 0 :margin 0
@ -125,13 +128,15 @@ ul.nav
:color #ccc :color #ccc
#header_below #header_below
:position relative
:background :background
:color #e6eff7 :color #e6eff7
:text-align right :text-align right
:height 70px
:margin
:bottom 40px
#left_pane #left_pane
:background :background
@ -146,32 +151,42 @@ ul#stream
:color #666 :color #666
> li > li
:list-style none :list-style none
:padding 2em :padding 1em
:-webkit-box-shadow 0 4px 5px -5px #999 //:-webkit-box-shadow 0 4px 5px -5px #999
:min-height 40px :border
:bottom 1px solid #f1f1f1
img.avatar img.avatar
:width 45px
background: #fff background: #fff
padding: 2px
:border 1px solid #eaeaea
:border-radius 3px
sp.message sp.message
:position absolute
:float left
:margin
:left 10px
:top -2px
:line-height 17px
:font :font
:size 120% :size 120%
:color #999 :family 'Lucida Grande'
:color #666
:text-shadow none :text-shadow none
:width 480px
sp.from sp.from
:color #000 :color #000
:font
:weight bold
sp.time sp.time
:color #ccc :color #bababa
:font-size 80% :font-size 70%
div.big_text div.big_text
:position relative
:font :font
:size 24px :size 24px
:weight bold :weight bold
@ -186,8 +201,21 @@ div.big_text
:font :font
:size 300% :size 300%
:line-height 100% :line-height 100%
a
:border none .filters
:position absolute
:right 0
:display inline
:font
:size 12px
:weight normal
div.small_text
:position relative
:font
:size 18px
:weight bold
#publish #publish
@ -196,16 +224,35 @@ div.big_text
:size 30px :size 30px
:padding 7px :padding 7px
:border-radius 5px :border-radius 5px
:width 90% :width 100%
:margin
:bottom 1em
#profile_image #profile_image
:display inline block
:margin :margin
:top 0 :top 0
:width 100px :width 100px
:border 2px solid #eaeaea :border 2px solid #eaeaea
.yellow
:background #FFFDB8 form
:border 1px solid #E3E08D :font
:size 130%
input
:font
:size 150%
:padding 0.2em
.centered
:text-align center
.info_pane
:padding 1em
:background
:color #1A1A21
:color #f5fafd
:margin
:bottom 1em