Merge branch 'global-dropdown-edits' into 'master'
Global dropdown edits See merge request !9336
This commit is contained in:
commit
f6ac952819
|
@ -111,15 +111,9 @@ header {
|
|||
}
|
||||
|
||||
li {
|
||||
.active a {
|
||||
&.active a {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
.badge {
|
||||
background-color: $white-light;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -132,7 +126,11 @@ header {
|
|||
|
||||
&:hover {
|
||||
background-color: $white-normal;
|
||||
color: $gl-header-nav-hover-color;
|
||||
}
|
||||
|
||||
&:focus {
|
||||
outline: none;
|
||||
background-color: $white-normal;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -24,12 +24,12 @@
|
|||
= link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
|
||||
%span
|
||||
Issues
|
||||
%span.badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened))
|
||||
(#{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
|
||||
%span.badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened))
|
||||
(#{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
|
||||
|
|
|
@ -2,13 +2,6 @@
|
|||
= render 'profiles/head'
|
||||
|
||||
= form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f|
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Application theme
|
||||
%p
|
||||
This setting allows you to customize the appearance of the site, e.g. the sidebar.
|
||||
.col-sm-12
|
||||
%hr
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Syntax highlighting theme
|
||||
|
|
|
@ -3,13 +3,6 @@
|
|||
Settings in the **Profile > Preferences** page allow the user to customize
|
||||
various aspects of the site to their liking.
|
||||
|
||||
## Application theme
|
||||
|
||||
Changing this setting allows the user to customize the color scheme used for the
|
||||
navigation bar on the left side of the screen.
|
||||
|
||||
The default is **Charcoal**.
|
||||
|
||||
## Syntax highlighting theme
|
||||
|
||||
_GitLab uses the [rouge ruby library][rouge] for syntax highlighting. For a
|
||||
|
|
|
@ -35,9 +35,9 @@ describe 'Navigation bar counter', feature: true, js: true, caching: true do
|
|||
end
|
||||
|
||||
def expect_counters(issuable_type, count)
|
||||
dashboard_count = find('li.active span.badge')
|
||||
dashboard_count = find('li.active')
|
||||
find('.global-dropdown-toggle').click
|
||||
nav_count = find(".dashboard-shortcuts-#{issuable_type} span.badge")
|
||||
nav_count = find(".dashboard-shortcuts-#{issuable_type}")
|
||||
|
||||
expect(nav_count).to have_content(count)
|
||||
expect(dashboard_count).to have_content(count)
|
||||
|
|
Loading…
Reference in New Issue