diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/assets/stylesheets/page_bundles/merge_requests.scss | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/assets/stylesheets/page_bundles/merge_requests.scss')
-rw-r--r-- | app/assets/stylesheets/page_bundles/merge_requests.scss | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss new file mode 100644 index 00000000000..5553dffac05 --- /dev/null +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -0,0 +1,96 @@ +@import 'mixins_and_variables_and_functions'; + +.compare-versions-container { + min-width: 0; +} + +.diff-files-holder { + flex: 1; + min-width: 0; + z-index: 201; +} + +.diff-tree-list { + position: -webkit-sticky; + position: sticky; + $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 15px; + top: $top-pos; + max-height: calc(100vh - #{$top-pos}); + z-index: 202; + + .with-system-header & { + top: $top-pos + $system-header-height; + } + + .with-system-header.with-performance-bar & { + top: $top-pos + $system-header-height + $performance-bar-height; + } + + .with-performance-bar & { + $performance-bar-top-pos: $performance-bar-height + $top-pos; + top: $performance-bar-top-pos; + max-height: calc(100vh - #{$performance-bar-top-pos}); + } + + .drag-handle { + bottom: 16px; + transform: translateX(10px); + } +} + +.tree-list-holder { + height: 100%; + + .file-row { + margin-left: 0; + margin-right: 0; + } +} + +.tree-list-scroll { + max-height: 100%; + padding-bottom: $grid-size; + overflow-y: scroll; + overflow-x: auto; +} + +.tree-list-search { + flex: 0 0 34px; + + .form-control { + padding-left: 30px; + } +} + +.tree-list-icon { + top: 50%; + left: 10px; + transform: translateY(-50%); + + &, + svg { + fill: var(--gray-400, $gray-400); + } +} + +.tree-list-clear-icon { + right: 10px; + left: auto; + line-height: 0; +} + +@media (max-width: map-get($grid-breakpoints, md)-1) { + .diffs .files { + .diff-tree-list { + position: relative; + top: 0; + // !important is required to override inline styles of resizable sidebar + width: 100% !important; + } + + .tree-list-holder { + max-height: calc(50px + 50vh); + padding-right: 0; + } + } +} |