diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/assets/stylesheets/page_bundles | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/assets/stylesheets/page_bundles')
8 files changed, 77 insertions, 74 deletions
diff --git a/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss b/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss index 3327f8da632..613d27a2f39 100644 --- a/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss +++ b/app/assets/stylesheets/page_bundles/_pipeline_mixins.scss @@ -52,7 +52,6 @@ width: $ci-action-dropdown-svg-size; height: $ci-action-dropdown-svg-size; position: relative; - top: 1px; vertical-align: initial; } } diff --git a/app/assets/stylesheets/page_bundles/build.scss b/app/assets/stylesheets/page_bundles/build.scss index d55d6b27576..d40c03b7fd1 100644 --- a/app/assets/stylesheets/page_bundles/build.scss +++ b/app/assets/stylesheets/page_bundles/build.scss @@ -44,13 +44,6 @@ } } - &.affix-top { - position: absolute; - right: 0; - left: 0; - top: 0; - } - .controllers { @include build-controllers(15px, center, false, 0, inline, 0); } @@ -177,12 +170,6 @@ width: 289px; overflow: auto; - svg { - margin-right: 3px; - height: 14px; - width: 14px; - } - a { padding: $gl-padding 10px $gl-padding 40px; width: 270px; diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss index 6c270852e53..a4a82fdcef3 100644 --- a/app/assets/stylesheets/page_bundles/ide.scss +++ b/app/assets/stylesheets/page_bundles/ide.scss @@ -563,24 +563,11 @@ $ide-commit-header-height: 48px; } .ide-commit-options { - label { - font-weight: normal; - - &.is-disabled { - .ide-option-label { - text-decoration: line-through; - } + .is-disabled { + .ide-option-label { + text-decoration: line-through; } } - - .form-text.text-muted { - margin-top: 0; - line-height: 0; - } -} - -.ide-commit-new-branch { - margin-left: 25px; } .ide-sidebar-link { diff --git a/app/assets/stylesheets/page_bundles/issues_show.scss b/app/assets/stylesheets/page_bundles/issues_show.scss index ade649faaae..c664e0a734e 100644 --- a/app/assets/stylesheets/page_bundles/issues_show.scss +++ b/app/assets/stylesheets/page_bundles/issues_show.scss @@ -24,8 +24,9 @@ /* The inside bullet aligns itself to the bottom, which we see when text to the right of * a multi-line list item wraps. We fix this by aligning it to the top, and excluding - * other elements adversely affected by this. Targeting ::marker doesn't seem to work. */ - > *:not(code):not(input):not(.gl-label) { + * other elements. Targeting ::marker doesn't seem to work, instead we exclude custom elements + * or anything with a class */ + > *:not(gl-emoji, code, [class]) { vertical-align: top; } @@ -75,29 +76,6 @@ } } -.description.work-items-enabled { - ul.task-list { - > li.task-list-item { - .js-add-task { - svg { - visibility: hidden; - } - - &:focus svg { - visibility: visible; - } - } - - &:hover, - &:focus-within { - .js-add-task svg { - visibility: visible; - } - } - } - } -} - .is-ghost { opacity: 0.3; pointer-events: none; diff --git a/app/assets/stylesheets/page_bundles/jira_connect.scss b/app/assets/stylesheets/page_bundles/jira_connect.scss index f153569f99b..0a2b3175aa9 100644 --- a/app/assets/stylesheets/page_bundles/jira_connect.scss +++ b/app/assets/stylesheets/page_bundles/jira_connect.scss @@ -33,12 +33,6 @@ $header-height: 40px; right: 0; } -.jira-connect-user { - position: fixed; - top: 10px; - right: 20px; -} - .jira-connect-app { margin-top: $header-height; height: calc(100% - #{$header-height}); diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index f04cdfba0e4..14873c54cd7 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -315,7 +315,7 @@ $tabs-holder-z-index: 250; } .mr-fast-forward-message { - padding-left: $gl-padding-50; + padding-left: $gl-spacing-scale-9; padding-bottom: $gl-padding; } @@ -610,10 +610,10 @@ $tabs-holder-z-index: 250; .mr-widget-extension { border-top: 1px solid var(--border-color, $border-color); - background-color: var(--gray-50, $gray-50); + background-color: var(--gray-10, $gray-10); &.clickable:hover { - background-color: var(--gray-100, $gray-100); + background-color: var(--gray-50, $gray-50); cursor: pointer; } } @@ -737,9 +737,70 @@ $tabs-holder-z-index: 250; } .merge-request-overview { - @include media-breakpoint-up(md) { + @include media-breakpoint-up(lg) { display: grid; - grid-template-columns: 1fr 270px; + grid-template-columns: calc(95% - 285px) auto; grid-gap: 5%; } } + +.container-fluid:not(.container-limited) { + .detail-page-header, + .detail-page-description, + .merge-request-tabs-container { + &.is-merge-request { + @include gl-mx-auto; + max-width: $fixed-layout-width - ($gl-padding * 2); + } + } +} + +.submit-review-dropdown { + &.show .dropdown-menu { + width: calc(100vw - 20px); + max-width: 650px; + + .gl-new-dropdown-inner { + max-height: none !important; + } + + .md-header { + .gl-tab-nav-item { + @include gl-text-gray-900; + @include gl-pb-5; + + &:hover { + @include gl-bg-none; + @include gl-text-gray-900; + + &:not(.gl-tab-nav-item-active) { + @include gl-inset-border-b-2-gray-200; + } + } + } + + .gl-tab-nav-item-active { + @include gl-font-weight-bold; + @include gl-text-gray-900; + @include gl-inset-border-b-2-theme-accent; + + &:active, + &:focus, + &:focus:active { + box-shadow: inset 0 -#{$gl-border-size-2} 0 0 var(--gl-theme-accent, $theme-indigo-500), + $focus-ring; + @include gl-outline-none; + } + } + } + } + + .gl-new-dropdown-contents { + padding: $gl-spacing-scale-4 !important; + } + + .md-preview-holder { + max-height: 180px; + height: 180px; + } +} diff --git a/app/assets/stylesheets/page_bundles/pipelines.scss b/app/assets/stylesheets/page_bundles/pipelines.scss index a225a0f0061..4946bbbebe5 100644 --- a/app/assets/stylesheets/page_bundles/pipelines.scss +++ b/app/assets/stylesheets/page_bundles/pipelines.scss @@ -74,11 +74,8 @@ .stage-cell { .stage-container { - align-items: center; - display: inline-flex; - - + .stage-container { - margin-left: 4px; + &:last-child { + margin-right: 0; } // Hack to show a button tooltip inline @@ -94,10 +91,11 @@ &:not(:last-child) { &::after { content: ''; - width: 4px; + border-bottom: 2px solid $gray-200; position: absolute; right: -4px; - border-bottom: 2px solid $gray-200; + top: 11px; + width: 4px; } } } diff --git a/app/assets/stylesheets/page_bundles/wiki.scss b/app/assets/stylesheets/page_bundles/wiki.scss index c64e159c648..9bbea48d2c0 100644 --- a/app/assets/stylesheets/page_bundles/wiki.scss +++ b/app/assets/stylesheets/page_bundles/wiki.scss @@ -1,5 +1,4 @@ @import 'mixins_and_variables_and_functions'; -@import 'highlight.js/scss/a11y-light'; @import 'components/content_editor'; .title .edit-wiki-header { |