diff options
Diffstat (limited to 'app/assets/stylesheets/pages')
| -rw-r--r-- | app/assets/stylesheets/pages/clusters.scss | 32 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/deploy_keys.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/environment_logs.scss | 54 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/events.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/help.scss | 40 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 126 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 336 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 105 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 63 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/prometheus.scss | 114 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 19 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/service_desk.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 25 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 246 |
15 files changed, 304 insertions, 876 deletions
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss deleted file mode 100644 index 27d81d8e53b..00000000000 --- a/app/assets/stylesheets/pages/clusters.scss +++ /dev/null @@ -1,32 +0,0 @@ -.clusters-container { - @include media-breakpoint-down(xs) { - .nav-controls { - @include gl-w-full; - order: -1; - - .gl-new-dropdown, - .split-content-button { - @include gl-w-full; - } - } - } -} - -.cluster-card-item { - @include media-breakpoint-up(sm) { - @include gl-pt-2; - min-height: 372px; - } -} - -.agent-activity-list { - .system-note .timeline-entry-inner { - .timeline-icon { - @include gl-mt-1; - } - } - - &.issuable-discussion .main-notes-list::before { - @include gl-top-3; - } -} diff --git a/app/assets/stylesheets/pages/deploy_keys.scss b/app/assets/stylesheets/pages/deploy_keys.scss deleted file mode 100644 index 997e42a8fd5..00000000000 --- a/app/assets/stylesheets/pages/deploy_keys.scss +++ /dev/null @@ -1,4 +0,0 @@ -.deploy-keys-title { - padding-bottom: 2px; - line-height: 2; -} diff --git a/app/assets/stylesheets/pages/environment_logs.scss b/app/assets/stylesheets/pages/environment_logs.scss deleted file mode 100644 index f8f40076142..00000000000 --- a/app/assets/stylesheets/pages/environment_logs.scss +++ /dev/null @@ -1,54 +0,0 @@ -.environment-logs-page { - .content-wrapper { - padding-bottom: 0; - } -} - -.environment-logs-viewer { - height: calc(100vh - #{$environment-logs-difference-xs-up}); - min-height: 700px; - - @include media-breakpoint-up(md) { - height: calc(100vh - #{$environment-logs-difference-md-up}); - } - - .with-performance-bar & { - height: calc(100vh - #{$environment-logs-difference-xs-up} - #{$performance-bar-height}); - - @include media-breakpoint-up(md) { - height: calc(100vh - #{$environment-logs-difference-md-up} - #{$performance-bar-height}); - } - } - - .top-bar { - .date-time-picker-wrapper, - .dropdown-toggle { - @include media-breakpoint-up(md) { - width: 140px; - } - - @include media-breakpoint-up(lg) { - width: 160px; - } - } - } - - .log-lines, - .gl-infinite-scroll-container { - // makes scrollbar visible by creating contrast - background: $black; - height: 100%; - } - - .build-log { - @include build-log($black); - } - - .gl-infinite-scroll-legend { - margin: 0; - } - - .build-loader-animation { - @include build-loader-animation; - } -} diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index 33d00027404..ce8dd6684f2 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -84,6 +84,10 @@ iframe.twitter-share-button { vertical-align: bottom; } + + .gl-label-scoped.gl-label-sm { + --label-inset-border: inset 0 0 0 1px currentColor; + } } code { diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss deleted file mode 100644 index 9182292ffd3..00000000000 --- a/app/assets/stylesheets/pages/help.scss +++ /dev/null @@ -1,40 +0,0 @@ -.shortcut-help { - &-body { - height: 80vh; - overflow-y: scroll; - } - - &-container { - column-count: 1; - @include media-breakpoint-up(md) { - column-count: 2; - } - column-gap: 1rem; - } - - &-mapping { - overflow: hidden; - break-inside: avoid; - - &-title { - margin-left: 40%; - } - - kbd { - margin: 0.1rem 0; - line-height: unset; - font-size: unset; - } - } -} - -.documentation { - padding: 7px; - font-size: $gl-font-size-large; -} - -.card.links-card { - a { - color: $blue-600; - } -} diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 85205f4d5ac..6070311dcb6 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -199,12 +199,15 @@ .sidebar-contained-width, .issuable-sidebar-header { width: 100%; - border-bottom: 0; } .block { @include media-breakpoint-up(lg) { - padding: $gl-spacing-scale-5 0; + padding: $gl-spacing-scale-4 0 $gl-spacing-scale-5; + } + + &.participants { + border-bottom: 0; } } } @@ -213,7 +216,8 @@ .sidebar-contained-width, .issuable-sidebar-header { @include clearfix; - padding: $gl-padding 0; + padding: $gl-spacing-scale-4 0 $gl-spacing-scale-5; + border-bottom: 1px solid $border-gray-normal; // This prevents the mess when resizing the sidebar // of elements repositioning themselves.. width: $gutter-inner-width; @@ -235,6 +239,13 @@ } } } + + &.time-tracking, + &.participants, + &.subscriptions, + &.with-sub-blocks { + padding-top: $gl-spacing-scale-5; + } } .block-first { @@ -724,13 +735,7 @@ } .issue-check { - padding-right: $gl-padding; - margin-bottom: 10px; min-width: 15px; - - .selected-issuable { - vertical-align: text-top; - } } .issuable-milestone, @@ -851,24 +856,6 @@ } } -.issuable-todo-btn { - .gl-spinner { - display: none; - } - - &.is-loading { - .gl-spinner { - display: inline-block; - } - - &.sidebar-collapsed-icon { - .issuable-todo-inner { - display: none; - } - } - } -} - /* * Following overrides are done to prevent * legacy dropdown styles from influencing @@ -927,88 +914,3 @@ } } } - -.icon-overlap-and-shadow { - filter: - drop-shadow(0 1px 0.5px #fff) - drop-shadow(1px 0 0.5px #fff) - drop-shadow(0 -1px 0.5px #fff) - drop-shadow(-1px 0 0.5px #fff); - margin-right: -7px; - z-index: 1; -} - -.issuable-discussion.incident-timeline-events { - .main-notes-list::before { - content: none; - } - - .timeline-event-note { - p { - margin-bottom: 0; - } - } -} - -/** - * We have a very specific design proposal where we cannot - * use `vertical-line` mixin as it is and have to use - * custom styles, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81284#note_904867444 - */ -.timeline-entry-vertical-line { - &::before, - &::after { - content: ''; - border-left: 2px solid $gray-50; - position: absolute; - left: 39px; - height: calc(100% + #{$gl-spacing-scale-5}); - top: -#{$gl-spacing-scale-5}; - } - - &:first-child::before { - content: none; - } - - &:first-child { - &::after { - top: $gl-spacing-scale-5; - height: calc(100% + #{$gl-spacing-scale-5}); - } - } - - &:last-child, - &.create-timeline-event { - &::before { - top: - #{$gl-spacing-scale-5} !important; // Override default positioning - @include gl-h-8; - } - - &::after { - content: none; - } - } -} - -.timeline-event-note-form { - padding-left: 20px; -} - -.timeline-entry:not(:last-child) { - .timeline-event-border { - @include gl-pb-5; - @include gl-border-gray-50; - @include gl-border-1; - @include gl-border-b-solid; - } -} - -.timeline-group:last-child { - .timeline-entry:last-child, - .create-timeline-event { - .timeline-event-bottom-border { - @include gl-border-b; - @include gl-pt-5; - } - } -} diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 843daec8cda..c88834c088f 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -123,6 +123,9 @@ ul.related-merge-requests > li gl-emoji { } .new-branch-col { + @include gl-pb-3; + @include gl-my-2; + .discussion-filter-container { &:not(:last-child) { margin-right: $gl-spacing-scale-3; @@ -221,7 +224,7 @@ ul.related-merge-requests > li gl-emoji { display: flex; .new-branch-col { - padding-top: 0; + @include gl-pb-0; align-self: center; } } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index fc1b78bf730..438b7b1afa6 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -1,15 +1,15 @@ -$system-note-icon-size: 32px; -$system-note-svg-size: 16px; +$system-note-icon-size: 2rem; +$system-note-svg-size: 1rem; @mixin vertical-line($left) { &::before { content: ''; - border-left: 2px solid $gray-10; + border-left: 2px solid var(--gray-10, $gray-10); position: absolute; top: 0; bottom: 0; - left: $left; - height: calc(100% - 20px); + left: calc(#{$left} - 1px); + height: calc(100% + 1.5rem); } } @@ -19,17 +19,10 @@ $system-note-svg-size: 16px; border-radius: $border-radius-default; } -.note-wrapper { - padding: $gl-padding $gl-padding-8 $gl-padding $gl-padding; - - &.outlined { - @include outline-comment(); - } -} - -.issuable-discussion { - .main-notes-list { - @include vertical-line(35px); +.issuable-discussion:not(.incident-timeline-events), +.limited-width-notes { + .main-notes-list > li.timeline-entry:not(:last-of-type) { + @include vertical-line(1rem); } } @@ -41,8 +34,6 @@ $system-note-svg-size: 16px; position: relative; &.timeline > .timeline-entry { - border: 1px solid $border-color; - border-radius: $border-radius-default; margin: $gl-padding 0; &.system-note, @@ -50,6 +41,117 @@ $system-note-svg-size: 16px; border: 0; } + .timeline-avatar { + height: 2rem; + } + + &.note-comment, + &.note-skeleton, + .draft-note { + .timeline-avatar { + margin-top: 5px; + } + + .timeline-content:not(.flash-container) { + margin-left: 2.5rem; + border: 1px solid $border-color; + border-radius: $gl-border-radius-base; + background-color: $white; + padding: $gl-padding-4 $gl-padding-8; + } + + .note-header-info { + min-height: 2rem; + display: flex; + align-items: center; + gap: 0 0.25rem; + flex-wrap: wrap; + } + } + + &.note-discussion { + .timeline-content .discussion-wrapper { + background-color: transparent; + } + + .timeline-content { + ul li { + &:first-of-type { + .timeline-avatar { + margin-top: 5px; + } + + .timeline-content { + margin-left: 2.5rem; + border-left: 1px solid $border-color; + border-right: 1px solid $border-color; + border-top: 1px solid $border-color; + border-top-left-radius: $gl-border-radius-base; + border-top-right-radius: $gl-border-radius-base; + background-color: $white; + padding: $gl-padding-4 $gl-padding-8; + } + } + + &:not(:first-of-type) .timeline-entry-inner { + margin-left: 2.5rem; + border-left: 1px solid $border-color; + border-right: 1px solid $border-color; + background-color: $white; + + .timeline-content { + padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding; + } + + .timeline-avatar { + margin: $gl-padding-8 0 0 $gl-padding; + } + + .timeline-discussion-body { + margin-left: 2rem; + } + } + } + + .diff-content { + ul li:first-of-type { + .timeline-avatar { + margin-top: 0; + } + + .timeline-content { + margin-left: 0; + border: 0; + padding: 0; + } + + .timeline-entry-inner { + margin-left: 2.5rem; + border-left: 1px solid $border-color; + border-right: 1px solid $border-color; + background-color: $white; + + .timeline-content { + padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding; + } + + .timeline-avatar { + margin: $gl-padding-8 0 0 $gl-padding; + } + + .timeline-discussion-body { + margin-left: 2rem; + } + } + } + } + } + + .discussion-reply-holder { + border: 1px solid $border-color; + } + } + &.note-form { margin-left: 0; @@ -88,10 +190,14 @@ $system-note-svg-size: 16px; .card { margin-bottom: 0; } - } - .timeline-discussion-body { - margin-top: -$gl-padding-8; + .note-header-info { + min-height: 2rem; + display: flex; + align-items: center; + gap: 0 0.25rem; + flex-wrap: wrap; + } } .discussion { @@ -116,16 +222,11 @@ $system-note-svg-size: 16px; &.being-posted { pointer-events: none; opacity: 0.5; - padding: $gl-padding; .dummy-avatar { background-color: $gray-100; border: 1px solid darken($gray-100, 25%); } - - .note-headline-light { - margin-left: 3px; - } } .editing-spinner { @@ -156,6 +257,7 @@ $system-note-svg-size: 16px; .note-edit-form { display: block; margin-left: 0; + margin-top: 0.5rem; &.current-note-edit-form + .note-awards { display: none; @@ -164,13 +266,17 @@ $system-note-svg-size: 16px; } .note-body { - padding: $gl-padding-4 $gl-padding-4 $gl-padding-4 $gl-padding-8; + padding: 0 $gl-padding-8 $gl-padding-8; overflow-x: auto; overflow-y: hidden; .note-text { word-wrap: break-word; } + + .suggestions { + margin-top: 4px; + } } .note-awards { @@ -186,9 +292,10 @@ $system-note-svg-size: 16px; } .system-note { - padding: $gl-padding-4 20px; + padding: $gl-padding-8 0; margin: $gl-padding 0; background-color: transparent; + font-size: $gl-font-size; .note-header-info { padding-bottom: 0; @@ -229,6 +336,15 @@ $system-note-svg-size: 16px; .note-body { overflow: hidden; + padding: 0; + + ul { + margin: 0.5rem 0; + } + + p { + margin-left: 1rem; + } .description-version { position: relative; @@ -305,7 +421,7 @@ $system-note-svg-size: 16px; height: $system-note-icon-size; border: 1px solid $gray-10; border-radius: $system-note-icon-size; - margin: -6px 0 0; + margin: -8px 0 0; svg { width: $system-note-svg-size; @@ -319,25 +435,38 @@ $system-note-svg-size: 16px; .discussion-filter-note { .timeline-icon { - width: $system-note-icon-size + 6; - height: $system-note-icon-size + 6; + width: $system-note-icon-size; + height: $system-note-icon-size; margin-top: -8px; } } } +.card .notes { + .system-note { + margin: 0; + padding: 0; + } + + .timeline-icon { + margin: 8px 0 0 14px; + } +} + + // Diff code in discussion view .discussion-body .diff-file { .file-title { cursor: default; - border-top: 1px solid $border-color; + border-top: 0; border-radius: 0; + margin-left: 2.5rem; @media (min-width: map-get($grid-breakpoints, md)) { --initial-top: calc(#{$header-height} + #{$mr-tabs-height}); &.is-sidebar-moved { - --initial-top: calc(#{$header-height} + #{$mr-tabs-height + 28px}); + --initial-top: calc(#{$header-height} + #{$mr-tabs-height + 24px}); } .with-performance-bar & { @@ -357,6 +486,40 @@ $system-note-svg-size: 16px; .line_content { white-space: pre-wrap; } + + .diff-content { + margin-left: 2.5rem; + + &.outdated-lines-wrapper { + margin-left: 0; + } + + .line_holder td:first-of-type { + @include gl-border-l; + } + + .line_holder td:last-of-type { + @include gl-border-r; + } + + .discussion-notes { + margin-left: -2.5rem; + + .notes { + background-color: transparent; + } + + .notes-content { + border: 0; + } + + .timeline-content { + border-top: 0 !important; + border-top-left-radius: 0 !important; + border-top-right-radius: 0 !important; + } + } + } } .tab-pane.notes { @@ -394,8 +557,17 @@ $system-note-svg-size: 16px; } .system-note { - background-color: $white; - padding: $gl-padding; + background-color: transparent; + padding: 0; + + .timeline-icon { + margin-top: -2px; + } + + .timeline-entry-inner .timeline-icon { + margin-top: $grid-size; + margin-left: 14px; + } } } @@ -487,6 +659,19 @@ $system-note-svg-size: 16px; .code-commit .notes-content, .diff-viewer > .image ~ .note-container { background-color: $white; + + li.note-comment { + padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding; + + .avatar { + margin-right: 0; + } + + .note-body { + padding: $gl-padding-4 0 $gl-padding-8; + margin-left: 2.5rem; + } + } } .diff-viewer > .image ~ .note-container form.new-note { @@ -540,9 +725,21 @@ $system-note-svg-size: 16px; padding-bottom: 0; } + .timeline-avatar { + margin-top: 5px; + } + .timeline-content { overflow-x: auto; overflow-y: hidden; + border-radius: $gl-border-radius-base; + padding: $gl-padding-8 !important; + @include gl-border; + + &.expanded { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + } } &.note-wrapper { @@ -568,19 +765,10 @@ $system-note-svg-size: 16px; .note { @include notes-media('max', map-get($grid-breakpoints, sm) - 1) { .note-header { - .note-actions { - flex-wrap: wrap; - margin-bottom: $gl-padding-12; - - > :first-child { - margin-left: 0; - } + .note-actions > :first-child { + margin-left: 0; } } - - .note-header-author-name { - display: block; - } } } @@ -593,11 +781,6 @@ $system-note-svg-size: 16px; } } -.note-header-info, -.note-actions { - padding-bottom: $gl-padding-4; -} - .system-note .note-header-info { padding-bottom: 0; } @@ -618,10 +801,6 @@ $system-note-svg-size: 16px; } .note-headline-meta { - .system-note-separator { - color: $gray-500; - } - .note-timestamp { white-space: nowrap; } @@ -667,18 +846,20 @@ $system-note-svg-size: 16px; } .note-actions { - align-self: flex-start; justify-content: flex-end; flex-shrink: 1; display: inline-flex; align-items: center; - margin-left: 10px; + margin-left: $gl-padding-8; color: $gray-400; - margin-top: -4px; @include notes-media('max', map-get($grid-breakpoints, sm) - 1) { + justify-content: flex-start; float: none; - margin-left: 0; + + .note-actions__mobile-spacer { + flex-grow: 1; + } } } @@ -719,7 +900,7 @@ $system-note-svg-size: 16px; } .discussion-toggle-button { - padding: 0; + padding: 0 $gl-padding-8 0 0; background-color: transparent; border: 0; line-height: 20px; @@ -868,6 +1049,28 @@ $system-note-svg-size: 16px; .note-discussion.timeline-entry { padding-left: 0; + ul.notes li.note-wrapper { + .timeline-content { + padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding; + } + + .timeline-avatar { + margin: $gl-padding-8 0 0 $gl-padding; + } + } + + ul.notes { + li.toggle-replies-widget { + margin-left: 0; + border-left: 0; + border-right: 0; + } + + div.discussion-reply-holder { + margin-left: 0; + } + } + &:last-child { border-bottom: 0; } @@ -894,6 +1097,16 @@ $system-note-svg-size: 16px; } } + .draft-note-component .draft-note.timeline-entry { + .timeline-content:not(.flash-container) { + padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding; + } + + .timeline-avatar { + margin: $gl-padding-8 0 0 $gl-padding; + } + } + .diff-comment-form { display: block; } @@ -909,8 +1122,7 @@ $system-note-svg-size: 16px; // See https://gitlab.com/gitlab-org/gitlab-foss/issues/53918#note_117038785 .unstyled-comments { .discussion-header { - padding: $gl-padding; - border-bottom: 1px solid $border-color; + padding: $gl-padding 0; } .discussion-form-container { diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 951e31ef768..8e4dd39e498 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -1,22 +1,3 @@ -.avatar-image { - margin-bottom: $grid-size; - - .avatar { - float: none; - } - - @include media-breakpoint-up(sm) { - float: left; - margin-bottom: 0; - } -} - -.avatar-file-name { - position: relative; - top: 2px; - display: inline-block; -} - .account-well { padding: 10px; background-color: $gray-light; @@ -29,42 +10,6 @@ } } -.user-avatar-button { - .file-name { - display: inline-block; - padding-left: 10px; - } -} - -.subkeys-list { - @include basic-list; - - li { - padding: 3px 0; - border: 0; - } -} - -.key-list-item { - .key-list-item-info { - @include media-breakpoint-up(sm) { - float: left; - } - } -} - -.ssh-keys-list { - .last-used-at, - .expires, - .key-created-at { - line-height: 32px; - } -} - -.key-created-at { - line-height: 42px; -} - .provider-btn-group { display: inline-block; margin-right: 10px; @@ -113,26 +58,6 @@ } } -.modal-profile-crop { - .modal-dialog { - width: 380px; - - @include media-breakpoint-down(xs) { - width: auto; - } - } - - .profile-crop-image-container { - height: 300px; - margin: 0 auto; - } - - .crop-controls { - padding: 10px 0 0; - text-align: center; - } -} - .created-personal-access-token-container { .btn-clipboard { border: 1px solid $border-color; @@ -247,36 +172,6 @@ table.u2f-registrations { } } -.edit-user { - svg { - fill: $gl-text-color-secondary; - } - - .form-group > label { - font-weight: $gl-font-weight-bold; - } - - .form-group > .form-text { - font-size: $gl-font-size; - } - - .emoji-menu-toggle-button { - @include emoji-menu-toggle-button; - padding: 6px 10px; - - .no-emoji-placeholder { - position: relative; - } - } - - @include media-breakpoint-down(sm) { - .input-md, - .input-lg { - max-width: 100%; - } - } -} - .help-block { color: $gl-text-color-secondary; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 0d45beab983..be8707dcd50 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -269,49 +269,27 @@ color: $gray-200; } -pre.light-well { - border-color: $well-light-border; -} - /* * Projects list rendered on dashboard and user page */ + +.project-row { + .description p { + margin-bottom: 0; + color: $gl-text-color-secondary; + } +} + .projects-list { @include basic-list; display: flex; flex-direction: column; - // Disable Flexbox for admin page - &.admin-projects, - &.group-settings-projects { - display: block; - - .project-row { - display: block; - - .description > p { - margin-bottom: 0; - } - } - } - .project-row { @include basic-list-stats; display: flex; align-items: center; padding: $gl-padding-12 0; - - &.no-description { - @include media-breakpoint-up(sm) { - .avatar-container { - align-self: center; - } - - .metadata-info { - margin-bottom: 0; - } - } - } } h2 { @@ -634,24 +612,6 @@ pre.light-well { } } -.clearable-input { - position: relative; - - .clear-icon { - display: none; - position: absolute; - right: 9px; - top: 9px; - } - - &.has-value { - .clear-icon { - cursor: pointer; - display: block; - } - } -} - .project-path { .form-control { min-width: 100px; @@ -810,10 +770,3 @@ pre.light-well { } } } - -@include media-breakpoint-down(xs) { - .fork-filtered-search { - width: 100%; - margin: $gl-spacing-scale-2 0; - } -} diff --git a/app/assets/stylesheets/pages/prometheus.scss b/app/assets/stylesheets/pages/prometheus.scss deleted file mode 100644 index 71cbd7d9613..00000000000 --- a/app/assets/stylesheets/pages/prometheus.scss +++ /dev/null @@ -1,114 +0,0 @@ -.prometheus-graphs { - .dropdown-buttons { - > div { - margin-left: auto; - } - } - - .col-form-label { - line-height: 1; - padding-top: 0; - } - - .form-group { - margin-bottom: map-get($spacing-scale, 3); - } - - .variables-section { - input { - @include media-breakpoint-up(sm) { - width: 160px; - } - } - } - - .links-section { - .gl-hover-text-blue-600-children:hover { - * { - @include gl-text-blue-600; - } - } - } -} - -.draggable { - &.draggable-enabled { - .draggable-panel { - border: $gray-100 1px solid; - border-radius: $border-radius-default; - margin: -1px; - cursor: grab; - } - - .prometheus-graph { - // Make dragging easier by disabling use of chart - pointer-events: none; - } - } - - &.sortable-chosen .draggable-panel { - background: $white; - box-shadow: 0 0 4px $gray-300; - } - - .draggable-remove { - z-index: 1; - - .draggable-remove-link { - cursor: pointer; - color: $gray-400; - background-color: $white; - } - } -} - -.prometheus-graphs-header { - .monitor-environment-dropdown-menu, - .monitor-dashboard-dropdown-menu { - &.show { - display: flex; - flex-direction: column; - overflow: hidden; - } - - .no-matches-message { - padding: $gl-padding-8 $gl-padding-12; - } - } - - .show-last-dropdown { - // same as in .dropdown-menu-toggle - // see app/assets/stylesheets/framework/dropdowns.scss - width: 160px; - } -} - -.prometheus-panel { - margin-top: 20px; -} - -.prometheus-graph-group { - display: flex; - flex-wrap: wrap; -} - -.prometheus-graph { - padding: $gl-padding-8; -} - -.alert-current-setting { - max-width: 240px; - - .badge.badge-danger { - color: $red-500; - background-color: $red-100; - } -} - -.prometheus-panel-builder { - .preview-date-time-picker { - // same as in .dropdown-menu-toggle - // see app/assets/stylesheets/framework/dropdowns.scss - width: 160px; - } -} diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index e8f71c8a21c..a8027d2a5f5 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -268,16 +268,6 @@ input[type='checkbox']:hover { } } - .search-clear { - position: absolute; - right: 10px; - top: 9px; - padding: 0; - line-height: 0; - background: none; - border: 0; - } - .search-icon { position: absolute; left: 10px; @@ -327,15 +317,6 @@ input[type='checkbox']:hover { } } -.search-clear { - color: $gray-darkest; - - &:hover, - &:focus { - color: $blue-600; - } -} - .search-page-form { .dropdown-menu-toggle, .btn-search { diff --git a/app/assets/stylesheets/pages/service_desk.scss b/app/assets/stylesheets/pages/service_desk.scss deleted file mode 100644 index 34ab5eb1b74..00000000000 --- a/app/assets/stylesheets/pages/service_desk.scss +++ /dev/null @@ -1,7 +0,0 @@ -.service-desk-issues { - .non-empty-state { - text-align: left; - padding-bottom: $gl-padding-top; - border-bottom: 1px solid $border-color; - } -} diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 56acf6de828..c364b233803 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -188,31 +188,6 @@ } } -.nested-settings { - padding-left: 20px; -} - -.input-btn-group { - display: flex; - - .input-large { - flex: 1; - } - - .btn { - margin-left: 10px; - } -} - -.content-list > .settings-flex-row { - display: flex; - align-items: center; - - .float-right { - margin-left: auto; - } -} - .prometheus-metrics-monitoring { .card { .card-toggle { diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss deleted file mode 100644 index a9fbff8958d..00000000000 --- a/app/assets/stylesheets/pages/tree.scss +++ /dev/null @@ -1,246 +0,0 @@ -.project-last-commit { - min-height: 4.75rem; -} - -.tree-holder { - .nav-block { - margin: 16px 0; - - .tree-ref-holder { - margin-right: 15px; - } - - @include media-breakpoint-up(sm) { - display: flex; - - .tree-ref-container { - flex: 1; - } - - .tree-controls { - text-align: right; - - .control { - float: left; - margin-left: 8px; - } - } - - .tree-ref-holder { - float: left; - } - - .tree-ref-target-holder { - display: inline-block; - } - - .repo-breadcrumb { - li:last-of-type { - position: relative; - } - } - } - } - - @include media-breakpoint-down(xs) { - .tree-ref-container { - justify-content: space-between; - } - - .repo-breadcrumb { - position: relative; - - .dropdown-menu { - left: inherit; - right: 0; - } - } - - .add-to-tree-dropdown { - position: absolute; - left: 0; - right: 0; - } - - .tree-controls { - margin-bottom: 10px; - - .btn:not(.dropdown-toggle-split), - .dropdown, - .btn-group { - width: 100%; - } - - .btn { - margin-top: 10px; - } - } - } - - .file-finder { - max-width: 500px; - width: 100%; - - .file-finder-input { - width: 95%; - display: inline-block; - } - } - - .add-to-tree { - vertical-align: top; - padding: 8px; - - svg { - top: 0; - } - } - - table.tree-table { - margin-bottom: 0; - - tr { - border-bottom: 1px solid $white-normal; - border-top: 1px solid $white-normal; - - &:last-of-type { - border-bottom-color: $white; - } - - td, - th { - line-height: 21px; - } - - th { - border: 0; - } - - td { - border-color: $border-color; - } - - &:hover:not(.tree-truncated-warning) { - td { - background-color: $blue-50; - background-clip: padding-box; - border-top: 1px solid $blue-200; - border-bottom: 1px solid $blue-200; - cursor: pointer; - } - } - - &.selected { - td { - background: $white-normal; - border-top: 1px solid $border-white-normal; - border-bottom: 1px solid $border-white-normal; - } - } - } - } - - .tree-item { - .link-container { - padding: 0; - - a { - padding: 10px $gl-padding; - display: block; - } - } - - .tree-item-file-name { - max-width: 320px; - vertical-align: middle; - - i, - a { - color: $gl-text-color; - } - - img { - position: relative; - top: -1px; - } - } - - .tree-item-file-external-link { - margin-right: 4px; - - span { - text-decoration: inherit; - } - } - } - - .tree-truncated-warning { - color: $orange-600; - background-color: $orange-50; - } - - .tree-time-ago { - min-width: 135px; - color: $gl-text-color-secondary; - } - - .tree-commit { - max-width: 320px; - color: $gl-text-color-secondary; - - .tree-commit-link { - color: $gl-text-color-secondary; - - &:hover { - text-decoration: underline; - } - } - } -} - -.blob-commit-info { - list-style: none; - margin: 0; - padding: 0; -} - -.blob-content-holder { - margin-top: $gl-padding; -} - -.blob-upload-dropzone-previews { - display: flex; - justify-content: center; - align-items: center; - text-align: center; - border: 2px; - border-style: dashed; - border-color: $border-color; - min-height: 200px; -} - -.repo-charts { - .sub-header { - margin: 20px 0; - } - - .sub-header-block.border-top { - margin-top: 20px; - padding: 0; - border-top: 1px solid $white-dark; - border-bottom: 0; - } - - .commit-stats li { - font-size: 16px; - } - - .tree-ref-header { - margin-bottom: 20px; - - h4 { - margin: 0; - line-height: 36px; - } - } -} |