diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 15:18:04 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 15:18:04 +0000 |
commit | dd7da8bd31926a1210011856f7d66ee43fa65156 (patch) | |
tree | 48e8d6cd77f833d331b700e4ee636ab40b7b2f8d /app/assets | |
parent | 944a3a7b7e19354abdfcaa79129d0736c4b8565f (diff) | |
download | gitlab-ce-dd7da8bd31926a1210011856f7d66ee43fa65156.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/_page_specific_files.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/projects_usage_quotas.scss (renamed from app/assets/stylesheets/pages/storage_quota.scss) | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/_page_specific_files.scss b/app/assets/stylesheets/_page_specific_files.scss index c7693fb993d..cd626f449d9 100644 --- a/app/assets/stylesheets/_page_specific_files.scss +++ b/app/assets/stylesheets/_page_specific_files.scss @@ -14,4 +14,3 @@ @import './pages/projects'; @import './pages/registry'; @import './pages/settings'; -@import './pages/storage_quota'; diff --git a/app/assets/stylesheets/pages/storage_quota.scss b/app/assets/stylesheets/page_bundles/projects_usage_quotas.scss index 347bd1316c0..8f2cbc402c9 100644 --- a/app/assets/stylesheets/pages/storage_quota.scss +++ b/app/assets/stylesheets/page_bundles/projects_usage_quotas.scss @@ -1,3 +1,5 @@ +@import 'mixins_and_variables_and_functions'; + .storage-type-usage { &:first-child { @include gl-rounded-top-left-base; @@ -12,6 +14,6 @@ &:not(:last-child) { @include gl-border-r-2; @include gl-border-r-solid; - @include gl-border-white; + border-right-color: var(--white, $white); } } |