Skip to content
Extraits de code Groupes Projets
Valider e5d29804 rédigé par danielvincent's avatar danielvincent
Parcourir les fichiers

little things

parent f6fd6bc9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -2,9 +2,9 @@ module DashboardsHelper ...@@ -2,9 +2,9 @@ module DashboardsHelper
def title_for_page def title_for_page
if params[:action] =='ostatus' if params[:action] =='ostatus'
'OStatus Dashboard' 'OStatus home'
else else
'Dashboard' 'home'
end end
end end
end end
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
- else - else
= link_to "login", new_user_session_path = link_to "login", new_user_session_path
.container .container
= link_to "home", root_path
|
= link_to "photos", albums_path = link_to "photos", albums_path
| |
= link_to "ostatus", ostatus_path = link_to "ostatus", ostatus_path
...@@ -48,14 +50,14 @@ ...@@ -48,14 +50,14 @@
.container .container
.span-24.last .span-24.last
.span-3.append-1.last .span-3.append-2.last
= link_to person_image_tag(User.owner), root_path = link_to person_image_tag(User.owner), root_path
= link_to "Edit your profile", edit_user_path(current_user) = link_to "Edit your profile", edit_user_path(current_user)
%br %br
%br %br
= render 'people/sidebar' if user_signed_in? = render 'people/sidebar' if user_signed_in?
.span-19.last
.span-18.last
= yield = yield
.span-24.last
= render "posts/debug" = render "posts/debug"
...@@ -64,7 +64,7 @@ a { ...@@ -64,7 +64,7 @@ a {
header { header {
position: relative; position: relative;
margin: -2em; margin: -2em;
margin-bottom: 2em; margin-bottom: 1em;
color: #555555; color: #555555;
background-color: #2b2726; background-color: #2b2726;
border-bottom: 1px solid #444444; border-bottom: 1px solid #444444;
...@@ -80,7 +80,7 @@ header { ...@@ -80,7 +80,7 @@ header {
color: white; color: white;
text-shadow: 0 2px 0 black; } text-shadow: 0 2px 0 black; }
header #diaspora_text a { header #diaspora_text a {
color: white; } color: #666666; }
header #diaspora_text span.sub_text { header #diaspora_text span.sub_text {
color: black; color: black;
text-shadow: none; } text-shadow: none; }
...@@ -156,6 +156,7 @@ form { ...@@ -156,6 +156,7 @@ form {
margin-left: 0em; } margin-left: 0em; }
#user_name { #user_name {
display: inline;
margin-bottom: 1em; } margin-bottom: 1em; }
#user_name a { #user_name a {
color: black; } color: black; }
...@@ -197,7 +198,8 @@ img.person_picture { ...@@ -197,7 +198,8 @@ img.person_picture {
display: inline block; } display: inline block; }
li.message > img.person_picture, li.message > img.person_picture,
li.comment > img.person_picture { li.comment > img.person_picture,
#session_action > img.person_picture {
height: 30px; height: 30px;
display: absolute; display: absolute;
float: left; float: left;
......
...@@ -68,7 +68,7 @@ a ...@@ -68,7 +68,7 @@ a
header header
:position relative :position relative
:margin -2em :margin -2em
:bottom 2em :bottom 1em
:color #555 :color #555
:background :background
:color #2B2726 :color #2B2726
...@@ -89,7 +89,7 @@ header ...@@ -89,7 +89,7 @@ header
:text :text
:shadow 0 2px 0 #000 :shadow 0 2px 0 #000
a a
:color #fff :color #666
span.sub_text span.sub_text
:color #000 :color #000
...@@ -182,6 +182,7 @@ form ...@@ -182,6 +182,7 @@ form
#user_name #user_name
:display inline
:margin :margin
:bottom 1em :bottom 1em
a a
...@@ -234,7 +235,8 @@ img.person_picture ...@@ -234,7 +235,8 @@ img.person_picture
:display inline block :display inline block
li.message > img.person_picture, li.message > img.person_picture,
li.comment > img.person_picture li.comment > img.person_picture,
#session_action > img.person_picture
:height 30px :height 30px
:display absolute :display absolute
:float left :float left
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter