diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-16 17:13:14 -0500 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-16 17:13:14 -0500 |
commit | d0eb9438e9b258d2fa399a7e54bdfd332e307252 (patch) | |
tree | c588717a5b722252d912b7c95b2b32594c9a56ac /app/assets/stylesheets | |
parent | 7657d202160e04e6b5e5412d949977bc48cdacea (diff) | |
parent | 4ade5ff42511d7931bebb28098c2dc2192caba3e (diff) | |
download | gitlab-ce-d0eb9438e9b258d2fa399a7e54bdfd332e307252.tar.gz |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index 51a17d1469e..16cf394c426 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -9,6 +9,8 @@ @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) { .page-with-sidebar { .header-logo { + background: $color-darker; + a { color: $color-light; @@ -88,8 +90,8 @@ } $theme-blue: #2980b9; -$theme-charcoal: #333c47; -$theme-graphite: #888; +$theme-charcoal: #3d454d; +$theme-graphite: #666; $theme-gray: #373737; $theme-green: #019875; $theme-violet: #548; @@ -100,11 +102,11 @@ body { } &.ui_charcoal { - @include gitlab-theme(#c5d0de, $theme-charcoal, #2b333d, #24272d); + @include gitlab-theme(#d6d7d9, #485157, $theme-charcoal, #353b41); } &.ui_graphite { - @include gitlab-theme(#ccc, $theme-graphite, #777, #666); + @include gitlab-theme(#ccc, #777, $theme-graphite, #555); } &.ui_gray { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 624c8249f7e..a3e1ac13a43 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -226,8 +226,7 @@ ul.notes { } } -.note-action-button, -.discussion-action-button { +.note-action-button { display: inline-block; margin-left: 10px; line-height: 24px; |