diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 06:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 06:08:46 +0300 |
| commit | 40a8d9a482e10a5f337b19c07d2f93bd8f90851b (patch) | |
| tree | d90077142ed5e74ef2633a2071a88c33fda9977e /app/assets/stylesheets | |
| parent | 6ef57128d73e6f3d36af042a6b38d4779fda8b6d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/new_card.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 17 |
2 files changed, 8 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/new_card.scss b/app/assets/stylesheets/framework/new_card.scss index a1d7761bd88..411f5300120 100644 --- a/app/assets/stylesheets/framework/new_card.scss +++ b/app/assets/stylesheets/framework/new_card.scss @@ -91,9 +91,7 @@ @include gl-border-gray-100; @include gl-rounded-base; } -} -.gl-new-card-body { // Table adjustments @mixin new-card-table-adjustments { tbody > tr { diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index ad792a6ee50..6aca2b5646c 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -76,10 +76,14 @@ } } -.settings-section::after { - content: ''; - display: block; - @include gl-pb-7; +.settings-section { + @include gl-pt-6; + + &::after { + content: ''; + display: block; + @include gl-pb-5; + } } .settings-section, @@ -87,11 +91,6 @@ @include gl-pt-0; } -// Fix for sticky header when there is no search bar. -.flash-container + .settings-section { - @include gl-pt-3; -} - .settings-section ~ .settings-section { @include gl-pt-6; } |