diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-13 10:53:19 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:43:37 +0200 |
| commit | 506836a695ae40ff200add21c639f3d13aaee9e9 (patch) | |
| tree | 74a35db1be6d0ef65c646b66f77ad5c535449d2e | |
| parent | 027309eb2ae54614a2ee1a0ca9e4cea76a86b94b (diff) | |
| download | gitlab-ce-506836a695ae40ff200add21c639f3d13aaee9e9.tar.gz | |
unify commit signature colors with pipeline status
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 26 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/status.scss | 21 |
3 files changed, 31 insertions, 24 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 3a98332e46c..6f91d11b369 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -118,3 +118,29 @@ @content; } } + +/* + * Mixin for status badges, as used for pipelines and commit signatures + */ +@mixin status-color($color-light, $color-main, $color-dark) { + color: $color-main; + border-color: $color-main; + + &:not(span):hover { + background-color: $color-light; + color: $color-dark; + border-color: $color-dark; + + svg { + fill: $color-dark; + } + } + + svg { + fill: $color-main; + } +} + +@mixin green-status-color { + @include status-color($green-50, $green-500, $green-700); +} diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 41c44a8560d..cd9f2d787c5 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -284,15 +284,15 @@ } } + .gpg-status-box { &.valid { - color: $brand-success; - border: 1px solid $brand-success; + @include green-status-color; } &.invalid { - color: $gray; - border: 1px solid $common-gray-light; + @include status-color($gray-dark, $gray, $common-gray-dark); + border-color: $common-gray-light; } } diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 67ad1ae60af..36f622db136 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -1,22 +1,3 @@ -@mixin status-color($color-light, $color-main, $color-dark) { - color: $color-main; - border-color: $color-main; - - &:not(span):hover { - background-color: $color-light; - color: $color-dark; - border-color: $color-dark; - - svg { - fill: $color-dark; - } - } - - svg { - fill: $color-main; - } -} - .ci-status { padding: 2px 7px 4px; border: 1px solid $gray-darker; @@ -41,7 +22,7 @@ } &.ci-success { - @include status-color($green-50, $green-500, $green-700); + @include green-status-color; } &.ci-canceled, |