diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 09:07:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 09:07:45 +0000 |
commit | f4186a753b86625a83e8499af14b5badd63a2ac2 (patch) | |
tree | b960dd9f4255e9eee9f87d28e853f163836aa4c5 /app/assets/stylesheets | |
parent | 0221116862ee66024a03492b4fbbe4e069d84303 (diff) | |
download | gitlab-ce-f4186a753b86625a83e8499af14b5badd63a2ac2.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 17 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/clusters.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/utilities.scss | 2 |
4 files changed, 15 insertions, 14 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 42d7b0d08f7..a9079f036ab 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -266,20 +266,9 @@ background-color: $blue-50; } - .badge { - border: 0; - outline: 0; - - &:hover { - text-decoration: underline; - } - - @include media-breakpoint-down(lg) { - font-size: $gl-font-size-xs; - padding-left: $gl-padding-4; - padding-right: $gl-padding-4; - font-weight: $gl-font-weight-bold; - } + .gl-label { + margin-top: 4px; + margin-right: 4px; } .confidential-icon { diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index 88d6b0d3746..b9d415ae237 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -163,3 +163,9 @@ color: $black; font-weight: $gl-font-weight-bold; } + +.cluster-status-indicator { + &.disabled { + background-color: $gray-600; + } +} diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index fd56f655c0a..85a8113ff1b 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -158,6 +158,10 @@ a:not(.btn) { color: inherit; + .gl-label-text:hover { + color: inherit; + } + &:hover { color: $blue-800; diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index 882ce29c671..1eff21401a2 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -54,8 +54,10 @@ .mh-50vh { max-height: 50vh; } .font-size-inherit { font-size: inherit; } +.gl-w-8 { width: px-to-rem($grid-size); } .gl-w-16 { width: px-to-rem($grid-size * 2); } .gl-w-64 { width: px-to-rem($grid-size * 8); } +.gl-h-8 { height: px-to-rem($grid-size); } .gl-h-32 { height: px-to-rem($grid-size * 4); } .gl-h-64 { height: px-to-rem($grid-size * 8); } |