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-03-31 03:08:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 03:08:09 +0300
commitf6e2f302412fcb32b644b379778964791789cb62 (patch)
tree29ed98fca33be12adc21ee75185a459c668fb7da /app/assets/stylesheets/vendors
parent95ad46159e4cd93f2b31838199180d824e041994 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/vendors')
-rw-r--r--app/assets/stylesheets/vendors/atwho.scss2
-rw-r--r--app/assets/stylesheets/vendors/tribute.scss4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/vendors/atwho.scss b/app/assets/stylesheets/vendors/atwho.scss
index 37ef52f9573..f855c5c0d3d 100644
--- a/app/assets/stylesheets/vendors/atwho.scss
+++ b/app/assets/stylesheets/vendors/atwho.scss
@@ -32,7 +32,7 @@
.cur {
.avatar {
@include disable-all-animation;
- border: 1px solid $white-light;
+ border: 1px solid $white;
}
}
diff --git a/app/assets/stylesheets/vendors/tribute.scss b/app/assets/stylesheets/vendors/tribute.scss
index 95b1d80a586..309cdf7245c 100644
--- a/app/assets/stylesheets/vendors/tribute.scss
+++ b/app/assets/stylesheets/vendors/tribute.scss
@@ -1,5 +1,5 @@
.tribute-container {
- background: $white-light;
+ background: $white;
border: 1px solid $gl-gray-100;
border-radius: $border-radius-base;
box-shadow: 0 0 5px $issue-boards-card-shadow;
@@ -30,7 +30,7 @@
.avatar {
@include disable-all-animation;
- border: 1px solid $white-light;
+ border: 1px solid $white;
}
small {