diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-25 14:31:44 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-25 14:31:44 +0000 |
commit | 2125752eca40273d878dca0ce1fea5f28fea1297 (patch) | |
tree | e2389a3d2af87544bb50c7bfd7a5d483a6eadc4b | |
parent | 6f15d027d37d5b08fd70d0c8393d26e5d63b632f (diff) | |
parent | 606dfdc497ec1e880c45b2f48a7f3e00de50b3a7 (diff) | |
download | gitlab-ce-2125752eca40273d878dca0ce1fea5f28fea1297.tar.gz |
Merge branch '10642-groups-css' into 'master'
Removes EE differences for groups.scss
Closes gitlab-ee#10642
See merge request gitlab-org/gitlab-ce!26544
-rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 8ade995525a..0a07747e0d4 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -15,6 +15,11 @@ word-wrap: nowrap; } +.content-list .group-name { + font-weight: $gl-font-weight-bold; + color: $pages-group-name-color; +} + .group-row { @include basic-list-stats; @@ -172,6 +177,50 @@ } } +.card { + .shared_runners_limit_under_quota { + color: $green-500; + } + + .shared_runners_limit_over_quota { + color: $red-500; + } +} + +.pipeline-quota { + border-top: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + margin: 0 0 $gl-padding; + + .row { + padding-top: 10px; + padding-bottom: 10px; + } + + .right { + text-align: right; + } + + .progress { + height: 6px; + width: 100%; + margin-bottom: 0; + margin-top: 4px; + } +} + +.user-settings-pipeline-quota { + margin-top: $gl-padding; + + .pipeline-quota { + border-top: 0; + } +} + +table.pipeline-project-metrics tr td { + padding: $gl-padding; +} + .mattermost-icon svg { width: 16px; height: 16px; |