diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 21:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 21:09:05 +0300 |
commit | 883d5720994852248f18cb3053dc9f053f28d6f9 (patch) | |
tree | 409c976ddc659f34afaae3b2e97f1d0325f6455c /app/assets/stylesheets | |
parent | 5e97da08cba997aefba6f6d13850f95536a80477 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/super_sidebar.scss | 22 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/merge_requests.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/utilities.scss | 8 |
4 files changed, 35 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 07db6b3c147..e60353578b0 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -38,6 +38,7 @@ @import 'framework/sidebar'; @import 'framework/contextual_sidebar_header'; @import 'framework/contextual_sidebar'; +@import 'framework/super_sidebar'; @import 'framework/tables'; @import 'framework/notes'; @import 'framework/tabs'; diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss new file mode 100644 index 00000000000..59a9df9ede0 --- /dev/null +++ b/app/assets/stylesheets/framework/super_sidebar.scss @@ -0,0 +1,22 @@ +.super-sidebar { + top: 0; + width: $contextual-sidebar-width; + + .user-bar { + background-color: $t-gray-a-04; + + .tanuki-logo { + @include gl-vertical-align-middle; + } + } + + .context-switcher-toggle { + &[aria-expanded='true'] { + background-color: $t-gray-a-08; + } + } +} + +.with-performance-bar .super-sidebar { + top: $performance-bar-height; +} diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index 4950561bcb7..2cc4ca55d19 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -1197,13 +1197,13 @@ $tabs-holder-z-index: 250; } .mr-section-container { + .media-body { + column-gap: 0; + } + .state-container-action-buttons { @include media-breakpoint-up(md) { flex-direction: row-reverse; - - .btn { - margin-left: auto; - } } } } diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index 714dd932147..48c268e1f2a 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -243,6 +243,14 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709 } } +.gl-gap-2 { + gap: $gl-spacing-scale-2; +} + +.gl-hover-bg-t-gray-a-08:hover { + background-color: $t-gray-a-08; +} + /* End gitlab-ui#1709 */ /* |