diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-15 07:56:51 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-15 07:56:51 +0000 |
commit | 05dd7f9718cdd74cfd20747e4bea534a1cba2ae1 (patch) | |
tree | 3f57aa042a97f0d2ad84cbf44493eef68e853605 /app/assets/stylesheets | |
parent | 98905c6e6ec61b0697e895d1ccfaaab82aa70666 (diff) | |
parent | 22d6ad7550a897e5a60249f3a5944883f1386fc1 (diff) | |
download | gitlab-ce-05dd7f9718cdd74cfd20747e4bea534a1cba2ae1.tar.gz |
Merge branch '52421-show-canary-no-canary-in-the-performance-bar' into 'master'
Resolve "Show canary / no-canary in the performance bar"
Closes #52421
See merge request gitlab-org/gitlab-ce!22222
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/performance_bar.scss | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index b7a95f604b8..0fde6e18cc7 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -605,6 +605,7 @@ $perf-bar-development: #4c1210; $perf-bar-bucket-bg: #111; $perf-bar-bucket-box-shadow-from: rgba($white-light, 0.2); $perf-bar-bucket-box-shadow-to: rgba($black, 0.25); +$perf-bar-canary-text: $orange-400; /* Issuable warning diff --git a/app/assets/stylesheets/performance_bar.scss b/app/assets/stylesheets/performance_bar.scss index 59fdbf31fe9..9c01a2f8bda 100644 --- a/app/assets/stylesheets/performance_bar.scss +++ b/app/assets/stylesheets/performance_bar.scss @@ -68,6 +68,10 @@ } } + .current-host.canary { + color: $perf-bar-canary-text; + } + strong { color: $white-light; } |