diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-17 20:53:09 -0600 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-17 20:53:09 -0600 |
| commit | feeffc442618d92040cd1cc38158b689a09988fd (patch) | |
| tree | b19c0ac2ddae23d830bbc69b99d920eec1f81363 /app/assets/stylesheets/themes/ui_modern.scss | |
| parent | 1a9c2ddc55cf563ea42d67811a19b2693d7a44e9 (diff) | |
| parent | 5bbc70da9cb439342bdbe022988e4e734d891f44 (diff) | |
| download | gitlab-ce-feeffc442618d92040cd1cc38158b689a09988fd.tar.gz | |
Merge branch 'master' into markdown-tags
Use the latest HTML pipeline gem
Diffstat (limited to 'app/assets/stylesheets/themes/ui_modern.scss')
| -rw-r--r-- | app/assets/stylesheets/themes/ui_modern.scss | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss index 308a03477db..70449882317 100644 --- a/app/assets/stylesheets/themes/ui_modern.scss +++ b/app/assets/stylesheets/themes/ui_modern.scss @@ -1,43 +1,6 @@ /** - * This file represent some UI that can be changed - * during web app restyle or theme select. - * - * Next items should be placed there - * - link colors - * - header restyles - * + * Modern GitLab UI theme */ .ui_modern { - /* - * Application Header - * - */ - header { - @extend .header-dark; - &.navbar-gitlab { - .navbar-inner { - background: #019875; - border-bottom: 1px solid #019875; - .app_logo, .navbar-toggle { - &:hover { - background-color: #018865; - } - } - .separator { - background: #018865; - border-left: 1px solid #11A885; - } - .nav > li > a { - color: #ADC; - } - .search-input { - border-color: #8ba; - } - } - } - } - - .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { - background: #019875; - } + @include dark-theme(#ADC, #019875, #018865, #017855); } |