little things

This commit is contained in:
danielvincent 2010-07-23 21:11:21 -07:00
parent f6fd6bc9e6
commit e5d298040d
4 changed files with 17 additions and 11 deletions

View file

@ -2,9 +2,9 @@ module DashboardsHelper
def title_for_page
if params[:action] =='ostatus'
'OStatus Dashboard'
'OStatus home'
else
'Dashboard'
'home'
end
end
end

View file

@ -40,6 +40,8 @@
- else
= link_to "login", new_user_session_path
.container
= link_to "home", root_path
|
= link_to "photos", albums_path
|
= link_to "ostatus", ostatus_path
@ -48,14 +50,14 @@
.container
.span-24.last
.span-3.append-1.last
.span-3.append-2.last
= link_to person_image_tag(User.owner), root_path
= link_to "Edit your profile", edit_user_path(current_user)
%br
%br
= render 'people/sidebar' if user_signed_in?
.span-18.last
.span-19.last
= yield
.span-24.last
= render "posts/debug"

View file

@ -64,7 +64,7 @@ a {
header {
position: relative;
margin: -2em;
margin-bottom: 2em;
margin-bottom: 1em;
color: #555555;
background-color: #2b2726;
border-bottom: 1px solid #444444;
@ -80,7 +80,7 @@ header {
color: white;
text-shadow: 0 2px 0 black; }
header #diaspora_text a {
color: white; }
color: #666666; }
header #diaspora_text span.sub_text {
color: black;
text-shadow: none; }
@ -156,6 +156,7 @@ form {
margin-left: 0em; }
#user_name {
display: inline;
margin-bottom: 1em; }
#user_name a {
color: black; }
@ -197,7 +198,8 @@ img.person_picture {
display: inline block; }
li.message > img.person_picture,
li.comment > img.person_picture {
li.comment > img.person_picture,
#session_action > img.person_picture {
height: 30px;
display: absolute;
float: left;

View file

@ -68,7 +68,7 @@ a
header
:position relative
:margin -2em
:bottom 2em
:bottom 1em
:color #555
:background
:color #2B2726
@ -89,7 +89,7 @@ header
:text
:shadow 0 2px 0 #000
a
:color #fff
:color #666
span.sub_text
:color #000
@ -182,6 +182,7 @@ form
#user_name
:display inline
:margin
:bottom 1em
a
@ -234,7 +235,8 @@ img.person_picture
:display inline block
li.message > img.person_picture,
li.comment > img.person_picture
li.comment > img.person_picture,
#session_action > img.person_picture
:height 30px
:display absolute
:float left