diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss index afd4a8fc..49d459ad 100644 --- a/app/assets/stylesheets/scss/navbar.scss +++ b/app/assets/stylesheets/scss/navbar.scss @@ -100,4 +100,18 @@ min-width: 45px; height: 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; } \ No newline at end of file diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml index 7a396a54..89504703 100644 --- a/app/views/layouts/_profile.html.haml +++ b/app/views/layouts/_profile.html.haml @@ -10,14 +10,15 @@ %img.img-rounded.profile--dropdown-img{src: current_user.profile_picture.url(:medium)} .media-body - if current_user.display_name.blank? - .profile--displayname + .profile--dropdown-username = current_user.screen_name - else - .profile--displayname + .profile--dropdown-displayname = current_user.display_name .profile--username = 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.divider - if current_user.admin?