summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-26 12:08:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-26 12:08:22 +0000
commit1691cbe307f7698b3ee39811278990c43b6751a5 (patch)
tree2bd7d5b7143242f540a9edde92c83c791ebf8af4 /app/assets/stylesheets
parent27c6c4bf061c3a2289ce4808b1b354535994d09d (diff)
downloadgitlab-ce-1691cbe307f7698b3ee39811278990c43b6751a5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/common.scss1
-rw-r--r--app/assets/stylesheets/pages/alert_management/list.scss18
2 files changed, 0 insertions, 19 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index aed5086e6ba..8016b063de6 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -425,7 +425,6 @@ img.emoji {
.append-right-32 { margin-right: 32px; }
.append-right-48 { margin-right: 48px; }
.prepend-right-32 { margin-right: 32px; }
-.append-bottom-2 { margin-bottom: 2px; }
.append-bottom-4 { margin-bottom: $gl-padding-4; }
.append-bottom-5 { margin-bottom: 5px; }
.append-bottom-8 { margin-bottom: $grid-size; }
diff --git a/app/assets/stylesheets/pages/alert_management/list.scss b/app/assets/stylesheets/pages/alert_management/list.scss
index 2eee093dfce..ebaeb3b345a 100644
--- a/app/assets/stylesheets/pages/alert_management/list.scss
+++ b/app/assets/stylesheets/pages/alert_management/list.scss
@@ -1,22 +1,4 @@
.alert-management-list {
- // consider adding these stateful variants to @gitlab-ui
- // https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/1178
- .hover-bg-blue-50:hover {
- background-color: $blue-50;
- }
-
- .hover-gl-cursor-pointer:hover {
- cursor: pointer;
- }
-
- .hover-gl-border-b-solid:hover {
- @include gl-border-b-solid;
- }
-
- .hover-gl-border-blue-200:hover {
- border-color: $blue-200;
- }
-
// these styles need to be deleted once GlTable component looks in GitLab same as in @gitlab/ui
table {
color: $gray-700;