diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/stylesheets/pages | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/clusters.scss | 14 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 24 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 1 |
5 files changed, 32 insertions, 19 deletions
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index 98074f8af29..d233adbf3d2 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -87,6 +87,20 @@ width: 145px; } + .empty-state--agent { + .text-content { + @include gl-max-w-full; + @include media-breakpoint-up(lg) { + max-width: 70%; + } + } + + .gl-alert-actions { + @include gl-mt-0; + @include gl-flex-wrap; + } + } + .top-area .nav-controls > .btn.btn-add-cluster { margin-right: 0; } diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index a114a1dc82d..5173aeb824e 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -183,6 +183,8 @@ } .commit-nav-buttons { + margin: 0 0.5rem; + a.btn, button { // See: https://gitlab.com/gitlab-org/gitlab-ui/-/issues/730 diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 1bc6dfbd84a..ee97e8af296 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -175,7 +175,8 @@ } } - .block { + .block, + .issuable-sidebar-header { @include clearfix; padding: $gl-padding 0; border-bottom: 1px solid $border-gray-normal; @@ -184,11 +185,6 @@ width: $gutter-inner-width; // -- - &.issuable-sidebar-header { - padding-top: 0; - padding-bottom: 10px; - } - &:last-child { border: 0; } @@ -273,10 +269,6 @@ padding: 0 20px; } - .issuable-sidebar-header { - padding-top: 10px; - } - &:not(.boards-sidebar):not([data-signed-in]):not([data-always-show-toggle]) { .issuable-sidebar-header { display: none; @@ -302,7 +294,6 @@ } .gutter-toggle { - margin-top: 7px; border-left: 1px solid $border-gray-normal; text-align: center; } @@ -331,20 +322,21 @@ width: $gutter-collapsed-width; padding: 0; - .block { + .block, + .issuable-sidebar-header { width: $gutter-collapsed-width - 2px; padding: 0; border-bottom: 0; overflow: hidden; + } + .block, + .gutter-toggle, + .sidebar-collapsed-container { &.with-sub-blocks .sub-block:hover, &:not(.with-sub-blocks):hover { background-color: $gray-100; } - - &.issuable-sidebar-header { - padding-top: 0; - } } .participants { diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 1abaff40bc9..8807ab5e597 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -87,6 +87,10 @@ $tabs-holder-z-index: 250; border: 1px solid $border-color; border-radius: $border-radius-default; background: var(--white, $white); + + > .mr-widget-border-top:first-of-type { + border-top: 0; + } } .mr-widget-body, @@ -702,7 +706,7 @@ $tabs-holder-z-index: 250; .mr-version-dropdown, .mr-version-compare-dropdown { - margin: 0 7px; + margin: 0 0.5rem; } .dropdown-title { @@ -711,7 +715,7 @@ $tabs-holder-z-index: 250; // Shortening button height by 1px to make compare-versions // header 56px and fit into our 8px design grid - button { + .btn { height: 34px; } @@ -885,7 +889,7 @@ $tabs-holder-z-index: 250; .media-body { min-width: 0; font-size: 12px; - margin-left: 40px; + margin-left: 32px; } &:not(:last-child) { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 01739c7eb3e..4a866489806 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -763,6 +763,7 @@ $system-note-svg-size: 16px; .note-button.add-diff-note { @include btn-comment-icon; opacity: 0; + will-change: opacity; &[disabled] { background: $white; |