kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make active links bold; fix badge styling

This commit is contained in:
Annabel Dunstone Gray 2017-02-13 16:16:03 -06:00
parent c780ad0e92
commit 23035d90b7
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/assets/stylesheets/framework/header.scss
View File

@ -100,24 +100,40 @@ header {
} }
} }
} }
}
.global-dropdown { .global-dropdown {
position: absolute; position: absolute;
left: -10px; left: -10px;
.badge {
font-size: 11px;
} }
.global-dropdown-toggle { li.active {
margin: 7px 0; a {
font-size: 18px; font-weight: bold;
padding: 6px 10px;
border: none;
background-color: $gray-light;
&: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 { .header-content {

11
app/views/layouts/header/_default.html.haml
View File

@ -6,12 +6,11 @@
%button.global-dropdown-toggle{ type: 'button', 'data-toggle' => 'dropdown' } %button.global-dropdown-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
= icon('bars') = icon('bars')
.dropdown-menu-nav .dropdown-menu-nav.global-dropdown-menu
%ul - if current_user
- if current_user = render 'layouts/nav/dashboard'
= render 'layouts/nav/dashboard' - else
- else = render 'layouts/nav/explore'
= render 'layouts/nav/explore'
%button.navbar-toggle{ type: 'button' } %button.navbar-toggle{ type: 'button' }
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
= icon('ellipsis-v') = icon('ellipsis-v')