diff options
author | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2017-04-05 10:08:29 +0200 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-19 00:28:22 -0500 |
commit | 85df725c5b644803fb5e961c1113939369209f94 (patch) | |
tree | f6c81e4f458f69b8d7a4dae0201e68957542c8f5 | |
parent | bbd83376d625b8d9cb73cbc83c3c0eb71b1abf32 (diff) | |
download | gitlab-ce-85df725c5b644803fb5e961c1113939369209f94.tar.gz |
Added profile name to user dropdown
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 9 | ||||
-rw-r--r-- | app/views/layouts/header/_default.html.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/30484-profile-dropdown-account-name.yml | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 2071d4dcfce..522082bc513 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -331,6 +331,15 @@ header { .dropdown-menu-nav { min-width: 140px; margin-top: -5px; + + .current-user { + padding: 5px 18px; + + span { + display: block; + font-weight: 600; + } + } } } diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index a9893dea68f..08b6e61eb7a 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -67,6 +67,10 @@ = icon('caret-down') .dropdown-menu-nav.dropdown-menu-align-right %ul + %li.current-user + Signed in as + %span #{current_user.name} + %li.divider %li = link_to "Profile", current_user, class: 'profile-link', aria: { label: "Profile" }, data: { user: current_user.username } %li diff --git a/changelogs/unreleased/30484-profile-dropdown-account-name.yml b/changelogs/unreleased/30484-profile-dropdown-account-name.yml new file mode 100644 index 00000000000..71aa1ce139b --- /dev/null +++ b/changelogs/unreleased/30484-profile-dropdown-account-name.yml @@ -0,0 +1,4 @@ +--- +title: Added profile name to user dropdown +merge_request: +author: |