diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-08 18:16:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-08 18:16:03 +0000 |
| commit | e3bd590af430a430dcbcdd25751c46bbd1ecf56c (patch) | |
| tree | 328bb248b90ec25f0f2274658b67ef059777df51 /app/assets/stylesheets | |
| parent | 6225d57e55eaa0205e939e7ed6577636b0ee47cf (diff) | |
| download | gitlab-ce-e3bd590af430a430dcbcdd25751c46bbd1ecf56c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/themes/_dark.scss | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 9cf435af726..2f3db25f53b 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -720,7 +720,7 @@ $calendar-activity-colors: ( #7fa8c9, #527ba0, #254e77, -); +) !default; /* * Commit Page diff --git a/app/assets/stylesheets/themes/_dark.scss b/app/assets/stylesheets/themes/_dark.scss index 1265d27d5f6..b8c9e913beb 100644 --- a/app/assets/stylesheets/themes/_dark.scss +++ b/app/assets/stylesheets/themes/_dark.scss @@ -259,3 +259,11 @@ $line-removed-dark: $red-200; $well-expand-item: $gray-200; $well-inner-border: $gray-200; + +$calendar-activity-colors: ( + #303030, + #333861, + #4a5593, + #6172c5, + #788ff7 +); |