From 23035d90b708216e75fb993a1e48a0426ddacb89 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 13 Feb 2017 16:16:03 -0600
Subject: [PATCH] Make active links bold; fix badge styling
---
app/assets/stylesheets/framework/header.scss | 40 ++++++++++++++------
app/views/layouts/header/_default.html.haml | 11 +++---
2 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 2a6273f1301..044d3517650 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -100,26 +100,42 @@ header {
}
}
}
+ }
- .global-dropdown {
- position: absolute;
- left: -10px;
+ .global-dropdown {
+ position: absolute;
+ left: -10px;
+
+ .badge {
+ font-size: 11px;
}
- .global-dropdown-toggle {
- margin: 7px 0;
- font-size: 18px;
- padding: 6px 10px;
- border: none;
- background-color: $gray-light;
+ li.active {
+ a {
+ font-weight: bold;
+ }
+ }
- &:hover {
- background-color: $white-normal;
- color: $gl-header-nav-hover-color;
+ li:hover {
+ .badge {
+ background-color: $white-light;
}
}
}
+ .global-dropdown-toggle {
+ margin: 7px 0;
+ font-size: 18px;
+ padding: 6px 10px;
+ border: none;
+ background-color: $gray-light;
+
+ &:hover {
+ background-color: $white-normal;
+ color: $gl-header-nav-hover-color;
+ }
+ }
+
.header-content {
position: relative;
height: $header-height;
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index ea56d92cf34..ddf50d6667f 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -6,12 +6,11 @@
%button.global-dropdown-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
%span.sr-only Toggle navigation
= icon('bars')
- .dropdown-menu-nav
- %ul
- - if current_user
- = render 'layouts/nav/dashboard'
- - else
- = render 'layouts/nav/explore'
+ .dropdown-menu-nav.global-dropdown-menu
+ - if current_user
+ = render 'layouts/nav/dashboard'
+ - else
+ = render 'layouts/nav/explore'
%button.navbar-toggle{ type: 'button' }
%span.sr-only Toggle navigation
= icon('ellipsis-v')
--
GitLab