diff options
Diffstat (limited to 'app/assets/stylesheets/framework')
23 files changed, 54 insertions, 351 deletions
diff --git a/app/assets/stylesheets/framework/banner.scss b/app/assets/stylesheets/framework/banner.scss deleted file mode 100644 index 71bbab2065d..00000000000 --- a/app/assets/stylesheets/framework/banner.scss +++ /dev/null @@ -1,40 +0,0 @@ -.banner-callout { - display: flex; - position: relative; - align-items: start; - - .banner-close { - position: absolute; - top: 10px; - right: 10px; - opacity: 1; - - .dismiss-icon { - color: $gl-text-color; - font-size: $gl-font-size; - } - } - - .banner-graphic { - margin: 0 $gl-padding $gl-padding 0; - } - - &.banner-non-empty-state { - border-bottom: 1px solid $border-color; - } - - @include media-breakpoint-down(xs) { - justify-content: center; - flex-direction: column; - align-items: center; - - .banner-title, - .banner-buttons { - text-align: center; - } - - .banner-graphic { - margin-left: $gl-padding; - } - } -} diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index a0682eabf01..549289450a4 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -1,9 +1,3 @@ -.centered-light-block { - text-align: center; - color: $gl-text-color; - margin: 20px; -} - .nothing-here-block { text-align: center; padding: 16px; @@ -83,22 +77,6 @@ > p:last-child { margin-bottom: 0; } - - .block-controls { - display: flex; - justify-content: flex-end; - flex: 1; - - .control { - float: left; - margin-left: 10px; - } - } - - &.build-content { - background-color: $white; - border-top: 0; - } } .sub-header-block { @@ -169,31 +147,6 @@ } } - &.groups-cover-block { - background: $white; - border-bottom: 1px solid $border-color; - text-align: left; - padding: 24px 0; - - .group-info { - .cover-title { - margin-top: 9px; - } - - p { - margin-bottom: 0; - } - } - - @include media-breakpoint-down(xs) { - text-align: center; - - .avatar { - float: none; - } - } - } - &.user-cover-block { padding: 24px 0 0; @@ -214,19 +167,6 @@ margin-right: auto; } } - - .group-info { - h1 { - display: inline; - font-weight: $gl-font-weight-normal; - font-size: 24px; - color: $gl-text-color; - } - } -} - -.block-connector { - margin-top: -1px; } .content-block { @@ -322,7 +262,7 @@ display: inline-block; } - .btn { + .btn:not(.split-content-button):not(.dropdown-toggle-split) { margin: $gl-padding-8 $gl-padding-4; @include media-breakpoint-down(xs) { @@ -332,10 +272,6 @@ } } -.flex-right { - margin-left: auto; -} - .code-block { white-space: pre; overflow-x: auto; diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index ceccec8c5cb..e458dfd5316 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -247,13 +247,6 @@ } } -.btn-terminal { - svg { - height: 14px; - width: $default-icon-size; - } -} - .btn-lg { padding: 12px 20px; } @@ -281,12 +274,6 @@ } } -.btn-align-content { - display: flex; - justify-content: center; - align-items: center; -} - .btn-group { &.btn-grouped { @include btn-with-margin; @@ -347,16 +334,6 @@ } } -.btn-static { - background-color: $gray-light !important; - border: 1px solid $border-gray-normal; - cursor: default; - - &:active { - box-shadow: inset 0 0 0 $white; - } -} - .btn-inverted { &-secondary { @include btn-outline($white, $blue-500, $blue-500, $blue-100, $blue-700, $blue-500, $blue-200, $blue-600, $blue-800); diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index a7ce19ffc69..354d2737894 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -175,10 +175,6 @@ p.time { text-shadow: none; } -.thin-area { - height: 150px; -} - // Fix issue with notes & lists creating a bunch of bottom borders. li.note { img { max-width: 100%; } @@ -298,10 +294,6 @@ img.emoji { margin: 0; } -.space-right { - margin-right: 10px; -} - .alert { margin-bottom: $gl-padding; } @@ -363,14 +355,6 @@ img.emoji { } } -.outline-0 { - outline: 0; - - &:focus { - outline: 0; - } -} - /** COMMON CLASSES **/ /** 🚨 Do not use these classes — they are deprecated and being removed. 🚨 diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss index f5002a342b6..fa1892903a3 100644 --- a/app/assets/stylesheets/framework/contextual_sidebar.scss +++ b/app/assets/stylesheets/framework/contextual_sidebar.scss @@ -140,7 +140,7 @@ @include gl-border-none; .avatar.s32 { - @extend .rect-avatar.s32; + border-radius: $border-radius-default; box-shadow: $avatar-box-shadow; } } diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index 568182ad796..23dc16b7e7f 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -1007,6 +1007,27 @@ table.code { } } +// Notes tweaks for the Changes tab ONLY +.diff-tr { + .timeline-discussion-body { + clear: left; + + .note-body { + margin-top: 0 !important; + } + } + + .timeline-entry img.avatar { + margin-top: -2px; + margin-right: $gl-padding-8; + } + + // tiny adjustment to vertical align with the note header text + .discussion-collapsible .timeline-icon { + padding-top: 2px; + } +} + .files:not([data-can-create-note]) .frame { cursor: auto; } @@ -1125,7 +1146,7 @@ table.code { } .discussion-collapsible { - margin: 0 $gl-padding $gl-padding 71px; + margin: 0 $gl-padding $gl-padding; .notes { border-radius: $border-radius-default; diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index b05fbfaae6c..7f960e3da51 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -76,6 +76,7 @@ } .dropdown-toggle, +.dropdown-menu-toggle, .confidential-merge-request-fork-group .dropdown-toggle { padding: 6px 8px 6px 10px; background-color: $white; @@ -131,7 +132,6 @@ // This is double classed to solve a specificity issue with the gitlab ui buttons .dropdown-menu-toggle.dropdown-menu-toggle { - @extend .dropdown-toggle; justify-content: flex-start; overflow: hidden; padding-right: 25px; @@ -425,21 +425,10 @@ } } -.dropdown-menu-drop-up { - top: auto; - bottom: 100%; -} - .dropdown-menu-large { width: 340px; } -.dropdown-menu-no-wrap { - a { - white-space: normal; - } -} - .dropdown-menu-full-width { width: 100%; } @@ -662,13 +651,6 @@ padding-right: 10px; } -.dropdown-due-date-footer { - padding-top: 0; - margin-left: 10px; - margin-right: 10px; - border-top: 0; -} - .dropdown-footer-list { font-size: 14px; @@ -742,24 +724,6 @@ } } -.dropdown-menu-due-date { - .dropdown-content { - max-height: 230px; - } - - .pika-single { - position: relative !important; - top: 0 !important; - border: 0; - box-shadow: none; - } - - .pika-lendar { - margin-top: -5px; - margin-bottom: 0; - } -} - .dropdown-menu-inner-title { display: block; color: $gl-text-color; diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index c366bf80093..2a46e50f0da 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -196,14 +196,6 @@ label { } } -@include media-breakpoint-down(xs) { - .remember-me { - .remember-me-checkbox { - margin-top: 0; - } - } -} - .input-icon-wrapper, .select-wrapper { position: relative; diff --git a/app/assets/stylesheets/framework/job_log.scss b/app/assets/stylesheets/framework/job_log.scss index d48a5116677..f77f64f1d76 100644 --- a/app/assets/stylesheets/framework/job_log.scss +++ b/app/assets/stylesheets/framework/job_log.scss @@ -5,10 +5,10 @@ font-size: 13px; word-break: break-all; word-wrap: break-word; - color: color-yiq($builds-trace-bg); + color: color-yiq($builds-log-bg); border-radius: $border-radius-small; min-height: 42px; - background-color: $builds-trace-bg; + background-color: $builds-log-bg; } .log-line { @@ -42,10 +42,6 @@ } } -.log-duration-badge { - background: $gray-300; -} - .loader-animation { @include build-loader-animation; } diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index 7315bce1ed9..ef294635641 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -153,6 +153,10 @@ vertical-align: middle; margin-bottom: 3px; } + + .dropdown-chevron { + margin-bottom: 0; + } } @include media-breakpoint-down(xs) { diff --git a/app/assets/stylesheets/framework/media_object.scss b/app/assets/stylesheets/framework/media_object.scss index 89c561479cc..b573052c14a 100644 --- a/app/assets/stylesheets/framework/media_object.scss +++ b/app/assets/stylesheets/framework/media_object.scss @@ -6,7 +6,3 @@ .media-body { flex: 1; } - -.media-body-wrap { - flex-grow: 1; -} diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index fcf86680bb3..33f7aa4dba1 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -239,7 +239,7 @@ /* * Mixin that handles the container for the job logs (CI/CD and kubernetes pod logs) */ -@mixin build-trace($background: $black) { +@mixin build-log($background: $black) { background: $background; color: $gray-darkest; white-space: pre; @@ -253,13 +253,13 @@ display: block; } - &.build-trace-rounded { + &.build-log-rounded { border-radius: $gl-border-radius-base; } } // Used in EE for Web Terminal -@mixin build-trace-bar($height) { +@mixin build-log-bar($height) { height: $height; min-height: $height; background: var(--gray-50, $gray-50); @@ -268,8 +268,8 @@ padding: $grid-size; } -@mixin build-trace-top-bar($height) { - @include build-trace-bar($height); +@mixin build-log-top-bar($height) { + @include build-log-bar($height); position: -webkit-sticky; position: sticky; diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 48a18e0d145..c9b17f5d5c4 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -1,13 +1,3 @@ -.modal-xl { - max-width: 98%; -} - -.modal-1040 { - @include media-breakpoint-up(xl) { - max-width: 1040px; - } -} - .modal-header { background-color: $modal-body-bg; @@ -111,30 +101,3 @@ body.modal-open { } } } - -.recaptcha-modal .recaptcha-form { - display: inline-block; - - .recaptcha { - margin: 0; - } -} - -.issues-import-modal, -.issuable-export-modal { - .modal-body { - padding: 0; - - .modal-subheader { - justify-content: flex-start; - align-items: center; - border-bottom: 1px solid $modal-border-color; - padding: 14px; - } - - .modal-text { - padding: $gl-padding-24 $gl-padding; - min-height: $modal-body-height; - } - } -} diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss index d9c93fed1c4..e5b2b853363 100644 --- a/app/assets/stylesheets/framework/panels.scss +++ b/app/assets/stylesheets/framework/panels.scss @@ -39,10 +39,6 @@ } } -.card-empty-heading { - border-bottom: 0; -} - .card-body { padding: $gl-padding; diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss index 06eebb95438..685f1f413e6 100644 --- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss +++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss @@ -1,6 +1,6 @@ // For tabbed navigation links, scrolling tabs, etc. For all top/main navigation, // please check nav.scss -.nav-links:not(.quick-links) { +.nav-links { display: flex; padding: 0; margin: 0; diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index d8ce6826fc1..900cf9fa4db 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -50,18 +50,6 @@ } } -.namespace-result { - .namespace-kind { - color: $gray-300; - font-weight: $gl-font-weight-normal; - } - - .namespace-path { - margin-left: 10px; - font-weight: $gl-font-weight-bold; - } -} - .ajax-users-dropdown { min-width: 250px !important; } diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 6b3201ba2b0..6c7fc25f2d9 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -16,21 +16,6 @@ transition: padding $sidebar-transition-duration; } -.nav-header-btn { - padding: 10px $gl-sidebar-padding; - color: inherit; - transition-duration: 0.3s; - position: absolute; - top: 0; - cursor: pointer; - - &:hover, - &:focus { - color: $white; - text-decoration: none; - } -} - .right-sidebar-collapsed { padding-right: 0; diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss index 47184804353..c59e70c80df 100644 --- a/app/assets/stylesheets/framework/snippets.scss +++ b/app/assets/stylesheets/framework/snippets.scss @@ -4,11 +4,6 @@ font-weight: $gl-font-weight-bold; } - .snippet-filename { - color: $gl-text-color-secondary; - font-weight: normal; - } - .snippet-info { color: $gl-text-color-secondary; } diff --git a/app/assets/stylesheets/framework/sortable.scss b/app/assets/stylesheets/framework/sortable.scss index 25868061d04..953c42219a9 100644 --- a/app/assets/stylesheets/framework/sortable.scss +++ b/app/assets/stylesheets/framework/sortable.scss @@ -36,61 +36,6 @@ } } -.related-issues-list-item { - .card-body, - .issuable-info-container { - padding: $gl-padding-4 $gl-padding-4 $gl-padding-4 $gl-padding; - - .block-truncated { - padding: $gl-padding-8 0; - line-height: $gl-btn-line-height; - } - - @include media-breakpoint-down(md) { - padding-left: $gl-padding; - - .block-truncated { - flex-direction: column-reverse; - padding: $gl-padding-4 0; - - .text-secondary { - margin-top: $gl-padding-4; - } - - .issue-token-title-text { - display: block; - } - } - - .issue-item-remove-button { - align-self: baseline; - } - } - - @include media-breakpoint-only(md) { - .block-truncated .issue-token-title-text { - white-space: nowrap; - } - - .issue-item-remove-button { - align-self: center; - } - } - - @include media-breakpoint-down(sm) { - padding-left: $gl-padding-8; - - .block-truncated .issue-token-title-text { - white-space: normal; - } - } - } - - &.is-dragging { - padding: 0; - } -} - .is-dragging { // Important because plugin sets inline CSS opacity: 1 !important; diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss index 92405c00c5e..c6bc8fa0eac 100644 --- a/app/assets/stylesheets/framework/tables.scss +++ b/app/assets/stylesheets/framework/tables.scss @@ -23,6 +23,7 @@ table { @include gl-text-gray-500; } + .md &:not(.code), &.table { margin-bottom: $gl-padding; diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index aeb3bb2286f..cb36c4e5767 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -75,6 +75,15 @@ details { margin-bottom: $gl-padding; + + > *:not(summary) { + margin-left: $gl-spacing-scale-5; + } + } + + summary > * { + display: inline-block; + margin-bottom: 0; } // Single code lines should wrap @@ -160,8 +169,6 @@ } table:not(.code) { - @extend .table; - @extend .table-bordered; margin: 16px 0; color: $gl-text-color; border: 0; @@ -172,9 +179,11 @@ tbody { background-color: $white; - td { - border-color: $gray-100; - } + } + + td, + th { + border: 1px solid $border-color; } tr { @@ -478,6 +487,7 @@ font-size: larger; } + figcaption, .small { font-size: smaller; } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 099dfa28b9f..026aeeb1e8e 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -697,7 +697,7 @@ $blame-blue: #254e77; /* * Builds */ -$builds-trace-bg: #111; +$builds-log-bg: #111; $job-log-highlight-height: 18px; $job-log-line-padding: 55px; $job-line-number-width: 50px; @@ -759,7 +759,6 @@ $help-shortcut-header-color: #333; */ $issues-today-bg: #f3fff2 !default; $issues-today-border: #e1e8d5 !default; -$compare-display-color: #888; /* * Label diff --git a/app/assets/stylesheets/framework/zen.scss b/app/assets/stylesheets/framework/zen.scss index 62abf4a7683..10df532e334 100644 --- a/app/assets/stylesheets/framework/zen.scss +++ b/app/assets/stylesheets/framework/zen.scss @@ -40,15 +40,6 @@ border: 0; } -.zen-control-full { - color: $gl-text-color-secondary; - - &:hover { - color: $blue-600; - text-decoration: none; - } -} - .zen-control-leave { display: none; color: $gl-text-color; |