Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 04:45:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 04:45:44 +0300
commit85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch)
tree9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/stylesheets/vendors
parent15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff)
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/stylesheets/vendors')
-rw-r--r--app/assets/stylesheets/vendors/atwho.scss6
-rw-r--r--app/assets/stylesheets/vendors/tribute.scss4
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/vendors/atwho.scss b/app/assets/stylesheets/vendors/atwho.scss
index f855c5c0d3d..f31dbbeafe8 100644
--- a/app/assets/stylesheets/vendors/atwho.scss
+++ b/app/assets/stylesheets/vendors/atwho.scss
@@ -24,8 +24,8 @@
.has-warning {
.description {
- color: $orange-700;
- background-color: $orange-100;
+ color: $gray-900;
+ background-color: $orange-50;
}
}
@@ -58,7 +58,7 @@
}
&.has-warning {
- color: $orange-700;
+ color: $orange-500;
}
}
diff --git a/app/assets/stylesheets/vendors/tribute.scss b/app/assets/stylesheets/vendors/tribute.scss
index 309cdf7245c..65f3d1b6199 100644
--- a/app/assets/stylesheets/vendors/tribute.scss
+++ b/app/assets/stylesheets/vendors/tribute.scss
@@ -1,6 +1,6 @@
.tribute-container {
background: $white;
- border: 1px solid $gl-gray-100;
+ border: 1px solid $gray-100;
border-radius: $border-radius-base;
box-shadow: 0 0 5px $issue-boards-card-shadow;
color: $black;
@@ -22,7 +22,7 @@
white-space: nowrap;
small {
- color: $gl-gray-500;
+ color: $gray-500;
}
&.highlight {