diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 12:21:28 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 12:21:28 +0000 |
| commit | 5ddba39eef738c8f31b86c589bd459222728f9ae (patch) | |
| tree | c56100a30ebbb87f0642d4ab629fe6fb849f356a | |
| parent | 1f1c59b61d30b76d69f0f925b43a0b96465f38ed (diff) | |
| parent | 51280fc76c168e146bd29b05adecae19c2892fc0 (diff) | |
| download | gitlab-ce-5ddba39eef738c8f31b86c589bd459222728f9ae.tar.gz | |
Merge branch 'improve-violet-theme' into 'master'
Improve violet theme
| -rw-r--r-- | app/assets/stylesheets/sections/profile.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/themes/ui_color.scss | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss index 7a696c21e47..76483d6783b 100644 --- a/app/assets/stylesheets/sections/profile.scss +++ b/app/assets/stylesheets/sections/profile.scss @@ -84,7 +84,7 @@ } &.violet { - background: #547; + background: #548; } } } diff --git a/app/assets/stylesheets/themes/ui_color.scss b/app/assets/stylesheets/themes/ui_color.scss index edac4290e74..a08f3ff3d48 100644 --- a/app/assets/stylesheets/themes/ui_color.scss +++ b/app/assets/stylesheets/themes/ui_color.scss @@ -16,28 +16,28 @@ @extend .header-dark; &.navbar-gitlab { .navbar-inner { - background: #547; - border-bottom: 1px solid #435; + background: #548; + border-bottom: 1px solid #436; .app_logo, .navbar-toggle { &:hover { - background-color: #435; + background-color: #436; } } .separator { - background: #435; - border-left: 1px solid #658; + background: #436; + border-left: 1px solid #659; } .nav > li > a { - color: #98B; + color: #98C; } .search-input { - border-color: #98B; + border-color: #98C; } } } } .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { - background: #769; + background: #659; } } |