diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-19 01:32:42 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-04-19 01:32:42 -0500 |
| commit | 303e9d7b8f73d8a19574da12ce7f4e40863c0dd8 (patch) | |
| tree | ad71eb8c3b5eadcaa278c12aa5777d7c71e09f33 | |
| parent | d0507591a8dc2d8047124e49e161066fda49c806 (diff) | |
| download | gitlab-ce-30484-profile-dropdown-account-name.tar.gz | |
Extract and reuse .bold class30484-profile-dropdown-account-name
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 4 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 2c33b235980..0fd7203e72b 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -40,6 +40,10 @@ line-height: 24px; } +.bold { + font-weight: 600; +} + .tab-content { overflow: visible; } diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 522082bc513..0077ea41d3b 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -335,9 +335,8 @@ header { .current-user { padding: 5px 18px; - span { + .user-name { display: block; - font-weight: 600; } } } diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 0bca3e93e4c..8d3d1a72b9b 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -210,10 +210,6 @@ } } - .bold { - font-weight: 600; - } - .light { font-weight: normal; } diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 40ccd836785..66f75f1c2bf 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -68,7 +68,7 @@ .dropdown-menu-nav.dropdown-menu-align-right %ul %li.current-user - %span + .user-name.bold = current_user.name @#{current_user.username} %li.divider |