diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-29 02:51:29 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-06 22:12:11 +0300 |
commit | 314cfc39a7c3832f212d9837970f6cc59c436a50 (patch) | |
tree | fb9be35c269bc4bc1b45bf69cea8daedaa418334 /app/assets/stylesheets/framework/new-nav.scss | |
parent | af86b5dec1ac8ea7120cc5eb51320bf21eea761a (diff) |
Fixes
Diffstat (limited to 'app/assets/stylesheets/framework/new-nav.scss')
-rw-r--r-- | app/assets/stylesheets/framework/new-nav.scss | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss index 3663ebf3039..0ee07b18b1f 100644 --- a/app/assets/stylesheets/framework/new-nav.scss +++ b/app/assets/stylesheets/framework/new-nav.scss @@ -397,3 +397,95 @@ header.navbar-gitlab-new { background-color: $white-light; } } + +.navbar-nav { + li { + .badge { + position: inherit; + font-weight: $gl-font-weight-normal; + margin-left: -6px; + font-size: 11px; + color: $white-light; + padding: 0 5px; + line-height: 12px; + border-radius: 7px; + box-shadow: 0 1px 0 rgba($gl-header-color, .2); + + &.issues-count { + background-color: $green-500; + } + + &.merge-requests-count { + background-color: $orange-600; + } + + &.todos-count { + background-color: $blue-500; + } + } + } +} + +@media (max-width: $screen-xs-max) { + header .container-fluid { + font-size: 18px; + + .navbar-nav { + display: table; + table-layout: fixed; + width: 100%; + margin: 0; + text-align: right; + } + + .navbar-collapse { + padding-left: 5px; + + .nav > li:not(.hidden-xs) { + display: table-cell !important; + width: 25%; + + a { + margin-right: 8px; + } + } + } + } + + .header-user-dropdown-toggle { + text-align: center; + } + + .header-user-avatar { + float: none; + } +} + +.header-user { + .dropdown-menu-nav { + width: auto; + min-width: 140px; + margin-top: -5px; + color: $gl-text-color; + left: auto; + + .current-user { + padding: 5px 18px; + + .user-name { + display: block; + } + } + } +} + +.header-user-avatar { + float: left; + margin-right: 5px; + border-radius: 50%; + border: 1px solid $avatar-border; +} + +.with-performance-bar header.navbar-gitlab { + top: $performance-bar-height; +} |