From 05ec7f8a0cb6d705ec2377c7b7d798f5eedea1f5 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 17 Feb 2017 08:08:50 -0600 Subject: Make active links in dropdown bold --- app/assets/stylesheets/framework/header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 367289968c9..0373bfc4ed5 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -111,7 +111,7 @@ header { } li { - .active a { + &.active a { font-weight: bold; } -- cgit v1.2.1 From 102587972d69ed7e34a1f4d8d8995a008692db90 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 17 Feb 2017 08:20:45 -0600 Subject: Remove badge styling in dropdown; remove blue outline --- app/assets/stylesheets/framework/header.scss | 12 +++++------- app/views/layouts/nav/_dashboard.html.haml | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 0373bfc4ed5..3945a789c82 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -114,12 +114,6 @@ header { &.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; } } diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index bb611d39be5..5d4178f03d7 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 - %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 -- cgit v1.2.1 From 0c6b1ad858270c772efc37f7e721a6825493d9ed Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 17 Feb 2017 10:15:33 -0600 Subject: Remove application theme settings from preferences --- app/views/profiles/preferences/show.html.haml | 7 ------- doc/profile/preferences.md | 7 ------- 2 files changed, 14 deletions(-) diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 787339e0fe2..df0a0212f3d 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -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 diff --git a/doc/profile/preferences.md b/doc/profile/preferences.md index 073b8797508..4f2b00f3dd1 100644 --- a/doc/profile/preferences.md +++ b/doc/profile/preferences.md @@ -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 -- cgit v1.2.1 From ee444bf340616192dc1e0807676bbe58ad1c3905 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 17 Feb 2017 14:23:29 -0600 Subject: Fix issuables_counter_spec --- spec/features/dashboard/issuables_counter_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/dashboard/issuables_counter_spec.rb b/spec/features/dashboard/issuables_counter_spec.rb index 603076d7d37..a1718912fc6 100644 --- a/spec/features/dashboard/issuables_counter_spec.rb +++ b/spec/features/dashboard/issuables_counter_spec.rb @@ -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) -- cgit v1.2.1