diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /app/assets/stylesheets/page_bundles/merge_requests.scss | |
parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'app/assets/stylesheets/page_bundles/merge_requests.scss')
-rw-r--r-- | app/assets/stylesheets/page_bundles/merge_requests.scss | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index 61f8f0de557..fc4a9d3dff9 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -301,10 +301,6 @@ $tabs-holder-z-index: 250; } .tree-list-icon { - top: 50%; - left: 10px; - transform: translateY(-50%); - &, svg { fill: var(--gray-400, $gray-400); @@ -327,15 +323,18 @@ $tabs-holder-z-index: 250; .diffs .files { .diff-tree-list { position: relative; + // height is fully handled on the javascript side in narrow view + min-height: 0; + height: auto; top: 0; // !important is required to override inline styles of resizable sidebar width: 100% !important; // avoid sticky elements overlap header and other elements z-index: 1; + @include gl-mb-3; } .tree-list-holder { - max-height: calc(50px + 50vh); padding-right: 0; } } @@ -550,7 +549,8 @@ $tabs-holder-z-index: 250; border-radius: $border-radius-default; } - .mr-widget-section:not(:first-child) > div { + .mr-widget-section:not(:first-child) > div, + .mr-widget-section .mr-widget-section > div { border-top: solid 1px var(--border-color, $border-color); } @@ -1271,3 +1271,32 @@ $tabs-holder-z-index: 250; margin-right: 8px; border: 2px solid var(--gray-50, $gray-50); } + +.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; + } + + .discussion-collapsible { + @include gl-m-0; + @include gl-border-l-0; + @include gl-border-r-0; + @include gl-border-b-0; + @include gl-rounded-top-left-none; + @include gl-rounded-top-right-none; + } +} |