diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 18:08:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 18:08:44 +0300 |
| commit | 06c9acad67a086a66f1d63aa1b79fc77a19cc646 (patch) | |
| tree | b2c642197d4a9e549417dadfb050d2645ec7ffa7 /app/assets/stylesheets | |
| parent | 01f48ebf027baee9f845cecbf094e91a98c9a324 (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/page_bundles/projects.scss (renamed from app/assets/stylesheets/pages/projects.scss) | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/stylesheets/_page_specific_files.scss b/app/assets/stylesheets/_page_specific_files.scss index 47701d0490a..72351f8ba0c 100644 --- a/app/assets/stylesheets/_page_specific_files.scss +++ b/app/assets/stylesheets/_page_specific_files.scss @@ -9,6 +9,5 @@ @import './pages/notes'; @import './pages/pipelines'; @import './pages/profile'; -@import './pages/projects'; @import './pages/registry'; @import './pages/settings'; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/page_bundles/projects.scss index 9ce470dbcf2..68139c55f5a 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/page_bundles/projects.scss @@ -1,3 +1,5 @@ +@import 'mixins_and_variables_and_functions'; + .new_project, .edit-project, .import-project { @@ -6,7 +8,7 @@ } .project-path .form-control { - border-radius: $border-radius-base; + border-radius: $gl-border-radius-base; } .input-group { @@ -47,7 +49,7 @@ } + .btn-default { - border-radius: 0 $border-radius-base $border-radius-base 0; + border-radius: 0 $gl-border-radius-base $gl-border-radius-base 0; } } } |