FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some more changes

This commit is contained in:
Andreas N 2015-02-12 16:48:14 +01:00
parent 55a4278c34
commit 1ef032e69e
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/stylesheets/scss/navbar.scss
View File

@ -100,4 +100,18 @@
min-width: 45px; min-width: 45px;
height: 45px; height: 45px;
width: 45px; width: 45px;
}
.profile--dropdown-username {
font-weight: 700;
font-size: 1.2em;
line-height: 1.33em;
margin-top: 9.5px;
}
.profile--dropdown-displayname {
font-weight: 700;
font-size: 1.2em;
line-height: 1.33em;
margin-top: 2px;
} }

7
app/views/layouts/_profile.html.haml
View File

@ -10,14 +10,15 @@
%img.img-rounded.profile--dropdown-img{src: current_user.profile_picture.url(:medium)} %img.img-rounded.profile--dropdown-img{src: current_user.profile_picture.url(:medium)}
.media-body .media-body
- if current_user.display_name.blank? - if current_user.display_name.blank?
.profile--displayname .profile--dropdown-username
= current_user.screen_name = current_user.screen_name
- else - else
.profile--displayname .profile--dropdown-displayname
= current_user.display_name = current_user.display_name
.profile--username .profile--username
= current_user.screen_name = current_user.screen_name
%li= link_to "View profile", show_user_profile_path(current_user.screen_name) %li.divider.hidden-xs
%li.visible-xs= link_to "View profile", show_user_profile_path(current_user.screen_name)
%li= link_to "Settings", edit_user_registration_path %li= link_to "Settings", edit_user_registration_path
%li.divider %li.divider
- if current_user.admin? - if current_user.admin?