diff options
Diffstat (limited to 'app/assets/stylesheets/page_bundles')
7 files changed, 19 insertions, 62 deletions
diff --git a/app/assets/stylesheets/page_bundles/ci_status.scss b/app/assets/stylesheets/page_bundles/ci_status.scss index 6b976106cc9..7adbf10b83a 100644 --- a/app/assets/stylesheets/page_bundles/ci_status.scss +++ b/app/assets/stylesheets/page_bundles/ci_status.scss @@ -1,10 +1,7 @@ @import 'mixins_and_variables_and_functions'; .ci-status { - padding: 2px 7px 4px; border: 1px solid var(--border-color, $border-color); - white-space: nowrap; - border-radius: 4px; &:hover, &:focus { diff --git a/app/assets/stylesheets/page_bundles/editor.scss b/app/assets/stylesheets/page_bundles/editor.scss index b7b698b2128..36da979ba1f 100644 --- a/app/assets/stylesheets/page_bundles/editor.scss +++ b/app/assets/stylesheets/page_bundles/editor.scss @@ -163,7 +163,6 @@ .gitignore-selector, .gitlab-ci-yml-selector, .dockerfile-selector, - .template-type-selector, .metrics-dashboard-selector { display: inline-block; vertical-align: top; diff --git a/app/assets/stylesheets/page_bundles/import.scss b/app/assets/stylesheets/page_bundles/import.scss index cd5e6d32e4e..a6c08e344f9 100644 --- a/app/assets/stylesheets/page_bundles/import.scss +++ b/app/assets/stylesheets/page_bundles/import.scss @@ -1,48 +1,10 @@ @import 'mixins_and_variables_and_functions'; -.import-jobs-from-col { - width: 37%; -} - - -.import-jobs-to-col { - width: 37%; -} - -.import-jobs-status-col { - width: 25%; -} - -.import-jobs-cta-col { - width: 1%; -} - -.import-entities-target-select { - &.disabled { - .import-entities-target-select-separator { - color: var(--gray-400, $gray-400); - border-color: var(--gray-100, $gray-100); - background-color: var(--gray-10, $gray-10); - } - } - - .import-entities-target-select-separator { - border-color: var(--gray-200, $gray-200); - background-color: var(--gray-10, $gray-10); - } - - .gl-form-input { - box-shadow: inset 0 0 0 1px var(--gray-200, $gray-200); - } -} - $import-bar-height: $gl-spacing-scale-11; .import-table-bar { - @include gl-sticky; height: $import-bar-height; top: $header-height; - z-index: 3; html.with-performance-bar & { top: calc(#{$header-height} + #{$performance-bar-height}); @@ -50,16 +12,11 @@ $import-bar-height: $gl-spacing-scale-11; } .import-table { - border-collapse: separate; - thead { - @include gl-sticky; - background-color: var(--gray-10, $gray-10); top: calc(#{$header-height} + #{$import-bar-height}); - z-index: 3; html.with-performance-bar & { - top: calc(#{$header-height + $performance-bar-height} + #{$import-bar-height}); + top: calc(#{$header-height} + #{$performance-bar-height} + #{$import-bar-height}); } } } diff --git a/app/assets/stylesheets/page_bundles/members.scss b/app/assets/stylesheets/page_bundles/members.scss index 8d2c0a8ca22..826921be8f0 100644 --- a/app/assets/stylesheets/page_bundles/members.scss +++ b/app/assets/stylesheets/page_bundles/members.scss @@ -76,6 +76,10 @@ width: px-to-rem(200px); } + .col-activity { + width: px-to-rem(250px); + } + .col-actions { width: px-to-rem(65px); } diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index 4950561bcb7..5c699dd81df 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -1002,12 +1002,12 @@ $tabs-holder-z-index: 250; .md-header { .gl-tab-nav-item { - @include gl-text-gray-900; + color: var(--gl-text-color, $gl-text-color); @include gl-pb-5; &:hover { @include gl-bg-none; - @include gl-text-gray-900; + color: var(--gl-text-color, $gl-text-color); &:not(.gl-tab-nav-item-active) { @include gl-inset-border-b-2-gray-200; @@ -1017,7 +1017,7 @@ $tabs-holder-z-index: 250; .gl-tab-nav-item-active { @include gl-font-weight-bold; - @include gl-text-gray-900; + color: var(--gl-text-color, $gl-text-color); @include gl-inset-border-b-2-theme-accent; &:active, @@ -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/page_bundles/oncall_schedules.scss b/app/assets/stylesheets/page_bundles/oncall_schedules.scss index b995724ec7c..f08d6e3ca95 100644 --- a/app/assets/stylesheets/page_bundles/oncall_schedules.scss +++ b/app/assets/stylesheets/page_bundles/oncall_schedules.scss @@ -5,14 +5,14 @@ } .timezone-dropdown { - .dropdown-menu { - @include gl-w-full; - } - .gl-dropdown-item-text-primary { @include gl-overflow-hidden; @include gl-text-overflow-ellipsis; } + + .btn-block { + margin-bottom: 0; + } } .modal-footer { @@ -20,7 +20,7 @@ } .invalid-dropdown { - .gl-dropdown-toggle { + .gl-button.gl-dropdown-toggle { @include inset-border-1-red-500; &:hover { diff --git a/app/assets/stylesheets/page_bundles/todos.scss b/app/assets/stylesheets/page_bundles/todos.scss index b35f5b38740..d4b0b4169d3 100644 --- a/app/assets/stylesheets/page_bundles/todos.scss +++ b/app/assets/stylesheets/page_bundles/todos.scss @@ -79,11 +79,11 @@ @include gl-py-0; @include gl-px-1; @include gl-m-0; - @include gl-bg-gray-50; @include gl-border-0; @include gl-rounded-base; @include gl-display-inline-flex; - @include gl-text-body; + background: var(--gray-50, $gray-50); + color: var(--gl-text-color, $gl-text-color); } .gl-label-scoped { |