diff options
Diffstat (limited to 'app/assets/stylesheets/page_bundles')
8 files changed, 41 insertions, 168 deletions
diff --git a/app/assets/stylesheets/page_bundles/admin/application_settings_metrics_and_profiling.scss b/app/assets/stylesheets/page_bundles/admin/application_settings_metrics_and_profiling.scss index 41bb6d107f1..db81cc7fdd4 100644 --- a/app/assets/stylesheets/page_bundles/admin/application_settings_metrics_and_profiling.scss +++ b/app/assets/stylesheets/page_bundles/admin/application_settings_metrics_and_profiling.scss @@ -1,3 +1,3 @@ -.usage-data { +.service-data-payload-container { max-height: 400px; } diff --git a/app/assets/stylesheets/page_bundles/boards.scss b/app/assets/stylesheets/page_bundles/boards.scss index a00a71b07e7..428bd90ddd7 100644 --- a/app/assets/stylesheets/page_bundles/boards.scss +++ b/app/assets/stylesheets/page_bundles/boards.scss @@ -472,6 +472,10 @@ .sidebar-collapsed-icon { display: none; } + + .gl-drawer-header { + align-items: flex-start; + } } .board-header-collapsed-info-icon:hover { diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss index 009019a45d9..47580e37eca 100644 --- a/app/assets/stylesheets/page_bundles/ide.scss +++ b/app/assets/stylesheets/page_bundles/ide.scss @@ -771,6 +771,12 @@ $ide-commit-header-height: 48px; } .dropdown-menu-toggle { + background-color: var(--ide-input-background, transparent); + + &:hover { + background-color: var(--ide-dropdown-btn-hover-background, $white-normal); + } + svg { vertical-align: middle; @@ -779,16 +785,6 @@ $ide-commit-header-height: 48px; color: var(--ide-text-color-secondary, $gray-500); } } - - &:hover { - background-color: var(--ide-dropdown-btn-hover-background, $white-normal); - } - } - - &.show { - .dropdown-menu-toggle { - background-color: var(--ide-input-background, $white-dark); - } } } diff --git a/app/assets/stylesheets/page_bundles/members.scss b/app/assets/stylesheets/page_bundles/members.scss index 7b4c74b8253..62dd3dcb9c0 100644 --- a/app/assets/stylesheets/page_bundles/members.scss +++ b/app/assets/stylesheets/page_bundles/members.scss @@ -1,10 +1,5 @@ @import 'mixins_and_variables_and_functions'; -.project-members-title { - padding-bottom: 10px; - border-bottom: 1px solid $border-color; -} - .invite-users-form { .btn-success { margin-right: 10px; @@ -12,12 +7,6 @@ } .member { - &.is-overridden { - .btn-ldap-override { - display: none !important; - } - } - .controls { @include media-breakpoint-up(sm) { display: flex; @@ -31,111 +20,12 @@ .form-group { margin-bottom: 0; } - - &.existing-title { - @include media-breakpoint-up(sm) { - float: left; - } - } -} - -.member-form-control { - @include media-breakpoint-down(xs) { - margin-right: 0; - width: auto; - } -} - -.member-search-btn { - position: absolute; - right: 4px; - top: 0; - height: $input-height; - padding-left: 10px; - padding-right: 10px; - color: $gray-darkest; - background: transparent; - border: 0; - outline: 0; } .members-ldap { align-self: center; } -.alert-member-ldap { - background-color: $orange-50; - - @include media-breakpoint-up(sm) { - line-height: 40px; - } - - > p { - float: left; - margin-bottom: 10px; - color: $orange-600; - - @include media-breakpoint-up(sm) { - padding-left: 55px; - margin-bottom: 0; - } - } - - .controls { - width: 100%; - - @include media-breakpoint-up(sm) { - width: auto; - } - } -} - -.btn-ldap-override { - width: 100%; - - @include media-breakpoint-up(sm) { - margin-left: 10px; - width: auto; - } -} - -.flex-project-members-panel { - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - - @include media-breakpoint-down(sm) { - display: block; - - .flex-project-title { - vertical-align: top; - display: inline-block; - max-width: 90%; - } - } - - .flex-project-title { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - - .badge.badge-pill { - height: 17px; - line-height: 16px; - margin-right: 5px; - padding-top: 1px; - padding-bottom: 1px; - } - - .flex-users-form { - flex-wrap: nowrap; - white-space: nowrap; - margin-left: auto; - } -} - .card { .card-header { .badge.badge-pill { @@ -168,33 +58,11 @@ word-break: break-all; } - .form-control { - width: inherit; - } - - .btn { - align-self: flex-start; - } - @include media-breakpoint-down(sm) { .member-access-text { margin: 0 0 $gl-padding-4 ($grid-size * 6); } } - - @include media-breakpoint-down(xs) { - display: block; - - .controls > .btn, - .controls .member-form-control { - margin: 0 0 $gl-padding-8; - display: block; - } - - .form-control { - width: 100%; - } - } } @@ -231,25 +99,5 @@ float: none; display: block; } - - .dropdown-menu-toggle, - .dropdown-menu, - .form-control, - .list-item-name { - width: 100%; - } - - .dropdown-menu { - margin-top: 0; - } - - .member-form-control { - margin: 5px 0; - } - - .btn { - width: 100%; - margin-left: 0; - } } } diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index 5e9dd883635..6a20ff3b3fa 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -7,6 +7,7 @@ .diff-files-holder { flex: 1; min-width: 0; + z-index: 203; .vue-recycle-scroller__item-wrapper { overflow: visible; diff --git a/app/assets/stylesheets/page_bundles/milestone.scss b/app/assets/stylesheets/page_bundles/milestone.scss index 03dd12ec230..08d9d24d246 100644 --- a/app/assets/stylesheets/page_bundles/milestone.scss +++ b/app/assets/stylesheets/page_bundles/milestone.scss @@ -65,15 +65,32 @@ $status-box-line-height: 26px; line-height: $line-height-base; padding: 14px 16px; display: flex; + justify-content: space-between; .title { flex: 1; flex-grow: 2; } - .counter { - flex: 0; - padding-left: 16px; + .issuable-count-weight { + white-space: nowrap; + + .counter, + .weight { + color: var(--gray-500, $gray-500); + font-weight: $gl-font-weight-bold; + } + } + + &.text-white { + .issuable-count-weight svg { + fill: $white; + } + + .issuable-count-weight .counter, + .weight { + color: var(--white, $white); + } } } } diff --git a/app/assets/stylesheets/page_bundles/new_namespace.scss b/app/assets/stylesheets/page_bundles/new_namespace.scss index 60aa3c8f29f..189f010bdb2 100644 --- a/app/assets/stylesheets/page_bundles/new_namespace.scss +++ b/app/assets/stylesheets/page_bundles/new_namespace.scss @@ -8,10 +8,11 @@ $new-namespace-panel-height: 240px; } .new-namespace-panel-wrapper { - @include media-breakpoint-down(md) { + width: 50%; + + @include media-breakpoint-down(lg) { width: 100%; } - width: 50%; } .new-namespace-panel { diff --git a/app/assets/stylesheets/page_bundles/pipelines.scss b/app/assets/stylesheets/page_bundles/pipelines.scss index 1081dd8f6d8..7b54be5c91f 100644 --- a/app/assets/stylesheets/page_bundles/pipelines.scss +++ b/app/assets/stylesheets/page_bundles/pipelines.scss @@ -62,6 +62,12 @@ .pipeline-tags .label-container { white-space: normal; } + + .dark-mode-override { + .gl-dark & { + background-color: $white; + } + } } // Mini Pipelines |