Commit e1061509 authored by Phil Hughes's avatar Phil Hughes

Merge branch '44383-cleanup-framework-header' into 'master'

Clean up selectors in framework/header.scss

Closes #44383

See merge request gitlab-org/gitlab-ce!17822
parents cd4ddee0 3c1a9307
.navbar-gitlab { .navbar-gitlab {
&.navbar-gitlab { padding: 0 16px;
padding: 0 16px; z-index: 1000;
z-index: 1000; margin-bottom: 0;
margin-bottom: 0; min-height: $header-height;
min-height: $header-height; border: 0;
border: 0; border-bottom: 1px solid $border-color;
border-bottom: 1px solid $border-color; position: fixed;
position: fixed; top: 0;
top: 0; left: 0;
left: 0; right: 0;
right: 0; border-radius: 0;
border-radius: 0;
.logo-text {
.logo-text { line-height: initial;
line-height: initial;
svg {
svg { width: 55px;
width: 55px; height: 14px;
height: 14px; margin: 0;
margin: 0; fill: $white-light;
fill: $white-light;
}
}
.container-fluid {
padding: 0;
.user-counter {
svg {
margin-right: 3px;
}
}
.navbar-toggle {
right: -10px;
border-radius: 0;
min-width: 45px;
padding: 0;
margin-right: -7px;
font-size: 14px;
text-align: center;
color: currentColor;
&:hover,
&:focus,
&.active {
color: currentColor;
background-color: transparent;
}
.more-icon,
.close-icon {
fill: $white-light;
margin: auto;
}
}
} }
} }
...@@ -184,6 +148,38 @@ ...@@ -184,6 +148,38 @@
} }
.container-fluid { .container-fluid {
padding: 0;
.user-counter {
svg {
margin-right: 3px;
}
}
.navbar-toggle {
right: -10px;
border-radius: 0;
min-width: 45px;
padding: 0;
margin-right: -7px;
font-size: 14px;
text-align: center;
color: currentColor;
&:hover,
&:focus,
&.active {
color: currentColor;
background-color: transparent;
}
.more-icon,
.close-icon {
fill: $white-light;
margin: auto;
}
}
.navbar-nav { .navbar-nav {
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
display: -webkit-flex; display: -webkit-flex;
......
---
title: Clean up selectors in framework/header.scss
merge_request: 17822
author: Takuya Noguchi
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment