diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-03-21 01:25:23 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-03-21 01:25:23 +0300 |
| commit | 6a0702fe9382c2b3c4a72421054d46821a95c781 (patch) | |
| tree | 9e72a10dfddcf1b93019e2903393dbc3edc0fb85 /app/assets | |
| parent | f7fcfc7720c5149e2fa6f027900503ae3f215bf1 (diff) | |
| parent | 0c3df3b56973d78345c6791cc3882a50d916cbc8 (diff) | |
Merge branch '57115-just-in-time-k8s-resource-creation' into 'master'
Create project-specific Kubernetes resources just-in-time
See merge request gitlab-org/gitlab-ce!25586
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/icons.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/status.scss | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss index 49b9b7014ae..3ab61cc5c47 100644 --- a/app/assets/stylesheets/framework/icons.scss +++ b/app/assets/stylesheets/framework/icons.scss @@ -31,6 +31,7 @@ } } +.ci-status-icon-preparing, .ci-status-icon-running { svg { fill: $blue-400; diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index df3a4be6559..7f8b8ea8100 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -166,6 +166,7 @@ float: left; .accept-merge-request { + &.ci-preparing, &.ci-pending, &.ci-running { @include btn-blue; diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index ef9c87d0452..bb08440fda8 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -795,6 +795,7 @@ @include mini-pipeline-graph-color($white, $orange-100, $orange-200, $orange-500, $orange-600, $orange-700); } + &.ci-status-icon-preparing, &.ci-status-icon-running { @include mini-pipeline-graph-color($white, $blue-100, $blue-200, $blue-500, $blue-600, $blue-700); } diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index f4d568d02ac..a59bb31bdcb 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -44,6 +44,7 @@ } &.ci-info, + &.ci-preparing, &.ci-running { @include status-color($blue-100, $blue-500, $blue-600); } |