diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-11 18:10:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-11 18:10:00 +0300 |
| commit | d06e4d855aed9148571c7fd95fe02f208a017dd3 (patch) | |
| tree | 83a1fe4bc449255b426f6b87fa4a37732a5c1fa1 /app/assets/stylesheets | |
| parent | 320d8adff14c100cd8a6798880b7eeff8e137f15 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/_page_specific_files.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss (renamed from app/assets/stylesheets/page_bundles/projects.scss) | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/stylesheets/_page_specific_files.scss b/app/assets/stylesheets/_page_specific_files.scss index 72351f8ba0c..47701d0490a 100644 --- a/app/assets/stylesheets/_page_specific_files.scss +++ b/app/assets/stylesheets/_page_specific_files.scss @@ -9,5 +9,6 @@ @import './pages/notes'; @import './pages/pipelines'; @import './pages/profile'; +@import './pages/projects'; @import './pages/registry'; @import './pages/settings'; diff --git a/app/assets/stylesheets/page_bundles/projects.scss b/app/assets/stylesheets/pages/projects.scss index 68139c55f5a..9ce470dbcf2 100644 --- a/app/assets/stylesheets/page_bundles/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -1,5 +1,3 @@ -@import 'mixins_and_variables_and_functions'; - .new_project, .edit-project, .import-project { @@ -8,7 +6,7 @@ } .project-path .form-control { - border-radius: $gl-border-radius-base; + border-radius: $border-radius-base; } .input-group { @@ -49,7 +47,7 @@ } + .btn-default { - border-radius: 0 $gl-border-radius-base $gl-border-radius-base 0; + border-radius: 0 $border-radius-base $border-radius-base 0; } } } |