diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
commit | e4384360a16dd9a19d4d2d25d0ef1f2b862ed2a6 (patch) | |
tree | 2fcdfa7dcdb9db8f5208b2562f4b4e803d671243 /app/assets/stylesheets/page_bundles/merge_requests.scss | |
parent | ffda4e7bcac36987f936b4ba515995a6698698f0 (diff) |
Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42
Diffstat (limited to 'app/assets/stylesheets/page_bundles/merge_requests.scss')
-rw-r--r-- | app/assets/stylesheets/page_bundles/merge_requests.scss | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index fc4a9d3dff9..5e20588dd70 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -226,7 +226,7 @@ $tabs-holder-z-index: 250; clear: left; .note-body { - padding: 0 0 $gl-padding-8; + padding: 0 $gl-padding-8 $gl-padding-8 $gl-padding-32; } } @@ -234,14 +234,15 @@ $tabs-holder-z-index: 250; margin-top: -2px; margin-right: $gl-padding-8; } +} - // tiny adjustment to vertical align with the note header text - .discussion-collapsible { - margin-left: 1rem; +// tiny adjustment to vertical align with the note header text +.discussion-collapsible { + border: 0 !important; + margin: 0; - .timeline-icon { - padding-top: 2px; - } + .timeline-icon { + padding-top: 2px; } } @@ -1275,20 +1276,12 @@ $tabs-holder-z-index: 250; .diff-file-discussions-wrapper { @include gl-w-full; - max-width: 800px; - - .diff-discussions > .notes { - @include gl-p-5; - } - .diff-discussions:not(:first-child) >.notes { @include gl-pt-0; } .note-discussion { - @include gl-rounded-base; - - border: 1px solid var(--gray-100, $gray-100) !important; + border-bottom: 1px solid var(--gray-100, $gray-100) !important; } .discussion-collapsible { |