Skip to content
Extraits de code Groupes Projets
Valider 03cf61bd rédigé par ilya's avatar ilya
Parcourir les fichiers

new user top bar

parent 1700ce8e
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -3,7 +3,7 @@ module StatusMessagesHelper ...@@ -3,7 +3,7 @@ module StatusMessagesHelper
def my_latest_message def my_latest_message
message = @latest_status_message message = @latest_status_message
unless message.nil? unless message.nil?
return message.message + " - " + how_long_ago(message) return message.message#+ " - " + how_long_ago(message)
else else
return "No message to display." return "No message to display."
end end
......
- if user_signed_in?
%h1#user_name
= link_to current_user.real_name, root_path
%span= title_for_page
%h3#latest_message
= my_latest_message
= render "shared/publisher" = render "shared/publisher"
%ul#stream %ul#stream
- for post in @posts - for post in @posts
......
...@@ -41,22 +41,28 @@ ...@@ -41,22 +41,28 @@
= link_to "logout", destroy_user_session_path = link_to "logout", destroy_user_session_path
- else - else
= link_to "login", new_user_session_path = link_to "login", new_user_session_path
.container .container
= link_to "home", root_path - if user_signed_in?
| #user_name
= link_to "photos", albums_path = link_to(person_image_tag(current_user), root_path)
| %h1
= link_to "ostatus", ostatus_path = link_to current_user.real_name, root_path
%br %span#latest_message
%br = my_latest_message
%ul.nav
%li= link_to "home", root_path
%li= link_to "photos", albums_path
%li= link_to "ostatus", ostatus_path
.container .container
.span-24.last .span-24.last
.span-20.append-1.last .span-20.append-1.last
= yield = yield
.span-3.last .span-3.last
= link_to(person_image_tag(current_user), root_path)
%br
= link_to "Edit your profile", edit_user_path(current_user) = link_to "Edit your profile", edit_user_path(current_user)
%br %br
%br %br
......
...@@ -64,7 +64,7 @@ a { ...@@ -64,7 +64,7 @@ a {
header { header {
position: relative; position: relative;
margin: -2em; margin: -2em;
margin-bottom: 1em; margin-bottom: 60px;
color: #555555; color: #555555;
background-color: #2b2726; background-color: #2b2726;
border-bottom: 3px solid #333333; border-bottom: 3px solid #333333;
...@@ -150,7 +150,7 @@ h1 { ...@@ -150,7 +150,7 @@ h1 {
padding: 0.1em; } padding: 0.1em; }
h3 { h3 {
position: relative; position: relativex;
font-size: 18px; font-size: 18px;
font-weight: bold; } font-weight: bold; }
...@@ -160,20 +160,28 @@ form { ...@@ -160,20 +160,28 @@ form {
margin-left: 0em; } margin-left: 0em; }
#user_name { #user_name {
display: inline; margin-bottom: 3em; }
margin-bottom: 1em; #user_name img {
font-size: 70px; margin-right: 10px;
line-height: 100px; } display: inline-block;
#user_name a { float: left;
color: black; } height: 40px; }
#user_name span { #user_name h1 {
line-height: 140px; margin-bottom: 7px;
font-size: 30%; line-height: 18px; }
color: #dddddd; #user_name h1 a {
float: right; } color: black; }
#user_name #latest_message {
#latest_message { font-weight: normal;
font-weight: normal; } color: #999999; }
#user_name ul {
display: inline;
margin: 0;
padding: 0;
list-style: none; }
#user_name ul > li {
display: inline;
margin-right: 1em; }
#stream div.comments { #stream div.comments {
display: none; } display: none; }
...@@ -201,8 +209,7 @@ ul.comment_set { ...@@ -201,8 +209,7 @@ ul.comment_set {
color: #333333; color: #333333;
font-weight: bold; } font-weight: bold; }
ul.comment_set li.comment form { ul.comment_set li.comment form {
margin-top: -5px; margin-top: -5px; }
padding-bottom: 8px; }
.profile_photo { .profile_photo {
float: left; float: left;
...@@ -291,8 +298,7 @@ label { ...@@ -291,8 +298,7 @@ label {
background-color: rgba(10, 81, 109, 0.05); background-color: rgba(10, 81, 109, 0.05);
border-bottom: 2px #999999 solid; border-bottom: 2px #999999 solid;
color: #999999; color: #999999;
padding: 20px 1em; padding: 15px 1em; }
padding-top: 10px; }
#new_blog, #new_blog,
#new_bookmark { #new_bookmark {
......
...@@ -68,7 +68,7 @@ a ...@@ -68,7 +68,7 @@ a
header header
:position relative :position relative
:margin -2em :margin -2em
:bottom 1em :bottom 60px
:color #555 :color #555
:background :background
:color #2B2726 :color #2B2726
...@@ -175,7 +175,7 @@ h1 ...@@ -175,7 +175,7 @@ h1
:padding 0.1em :padding 0.1em
h3 h3
:position relative :position relativex
:font :font
:size 18px :size 18px
:weight bold :weight bold
...@@ -188,24 +188,38 @@ form ...@@ -188,24 +188,38 @@ form
#user_name #user_name
:display inline
:margin :margin
:bottom 1em :bottom 3em
:font
:size 70px img
:line-height 100px :margin
a :right 10px
:color #000 :display inline-block
span :float left
:line-height 140px :height 40px
h1
:margin
:bottom 7px
:line-height 18px
a
:color #000
#latest_message
:font :font
:size 30% :weight normal
:color #dddddd :color #999
:float right
#latest_message ul
:font :display inline
:weight normal :margin 0
:padding 0
:list-style none
> li
:display inline
:margin
:right 1em
#stream div.comments #stream div.comments
...@@ -244,9 +258,6 @@ ul.comment_set ...@@ -244,9 +258,6 @@ ul.comment_set
form form
:margin :margin
:top -5px :top -5px
:padding
:bottom 8px
.profile_photo .profile_photo
:float left :float left
...@@ -350,8 +361,7 @@ label ...@@ -350,8 +361,7 @@ label
:border :border
:bottom 2px #999 solid :bottom 2px #999 solid
:color #999 :color #999
:padding 20px 1em :padding 15px 1em
:top 10px
#new_blog, #new_blog,
#new_bookmark #new_bookmark
......
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