diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-02 21:34:43 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-02 21:34:43 +0000 |
| commit | 6178c500a220909f67ad14f98e8b642773548891 (patch) | |
| tree | 78cab98958f5435d94c378099ba05328a19ffb15 | |
| parent | 12592ac7f4ae8ee8d074079b37940d5cbd91eb6a (diff) | |
| parent | d6c388da6bbd48f64b2192a6c40873002113a16a (diff) | |
| download | gitlab-ce-6178c500a220909f67ad14f98e8b642773548891.tar.gz | |
Merge branch '28410-dropdown-styling' into 'master'
Resolve "missing count badge styling in new sidebar dropdown"
Closes #28410
See merge request !9592
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 10 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/28410-dropdown-styling.yml | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 3187967aef0..6e8a5cc688b 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -193,6 +193,10 @@ &.is-focused { background-color: $dropdown-link-hover-bg; text-decoration: none; + + .badge { + background-color: darken($row-hover, 5%); + } } &.dropdown-menu-empty-link { @@ -229,6 +233,12 @@ padding: 5px 8px; color: $gl-text-color-secondary; } + + .badge { + position: absolute; + right: 8px; + top: 5px; + } } .dropdown-menu-drop-up { diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 4c9749205de..15285ee32a3 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -24,12 +24,12 @@ = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do %span Issues - (#{number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened))}) + .badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened)) = nav_link(path: 'dashboard#merge_requests') do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do %span Merge Requests - (#{number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened))}) + .badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened)) = nav_link(controller: 'dashboard/snippets') do = link_to dashboard_snippets_path, title: 'Snippets' do %span diff --git a/changelogs/unreleased/28410-dropdown-styling.yml b/changelogs/unreleased/28410-dropdown-styling.yml new file mode 100644 index 00000000000..2a7af1dd6e8 --- /dev/null +++ b/changelogs/unreleased/28410-dropdown-styling.yml @@ -0,0 +1,4 @@ +--- +title: Add badges to global dropdown +merge_request: +author: |