diff options
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/admin.scss | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/editor.scss | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 28 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/login.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 20 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 58 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 20 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 4 |
14 files changed, 57 insertions, 152 deletions
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss deleted file mode 100644 index af1eefd7587..00000000000 --- a/app/assets/stylesheets/pages/admin.scss +++ /dev/null @@ -1,18 +0,0 @@ -.info-well { - .admin-well-statistics, - .admin-well-features { - padding-bottom: 46px; - } -} - -.usage-data { - max-height: 400px; -} - -[data-page='admin:jobs:index'] { - .admin-builds-table { - td:last-child { - min-width: 120px; - } - } -} diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 9b17da80023..7111d3d4107 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -240,11 +240,6 @@ .commit, .generic-commit-status { - a, - button { - vertical-align: baseline; - } - a { color: $gl-text-color; diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss index 52bd16d1a79..ef737e11799 100644 --- a/app/assets/stylesheets/pages/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss @@ -74,14 +74,10 @@ justify-content: flex-end; } - .encoding-selector, .soft-wrap-toggle { display: inline-block; vertical-align: top; font-family: $regular-font; - } - - .soft-wrap-toggle { margin: 0 $btn-side-margin; .soft-wrap { @@ -128,15 +124,6 @@ margin: 3px 0; } - .encoding-selector { - display: block; - margin: 3px 0; - - button { - width: 100%; - } - } - @media(max-width: map-get($grid-breakpoints, md)-1) { clear: both; } diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index aeda91c1714..87307fd682e 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -260,7 +260,6 @@ } .pipeline-quota { - border-top: 1px solid $table-border-color; border-bottom: 1px solid $table-border-color; margin: 0 0 $gl-padding; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index e5528c25e82..a6ab5459a84 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -117,6 +117,11 @@ } } +.reviewer .merge-icon { + bottom: -3px; + right: -3px; +} + .right-sidebar { position: fixed; top: $header-height; @@ -156,14 +161,6 @@ color: inherit; } - // TODO remove this class once we can generate a correct hover utility from `gitlab/ui`, - // see here: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39286#note_396767000 - .btn-link-hover:hover { - * { - @include gl-text-blue-800; - } - } - .issuable-header-text { margin-top: 7px; } diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 1caf62067a6..2a8a86615f6 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -108,18 +108,6 @@ ul.related-merge-requests > li { } } -.issuable-email-modal-btn { - padding: 0; - color: $blue-600; - background-color: transparent; - border: 0; - outline: 0; - - &:hover { - text-decoration: underline; - } -} - .email-modal-input-group { margin-bottom: 10px; @@ -203,15 +191,9 @@ ul.related-merge-requests > li { } } -.discussion-reply-holder { - .avatar-note-form-holder .note-edit-form { - display: block; - margin-left: $note-icon-gutter-width; - - @include media-breakpoint-down(xs) { - margin-left: 0; - } - } +.discussion-reply-holder, +.note-edit-form { + display: block; } .issue-sort-dropdown { @@ -221,6 +203,10 @@ ul.related-merge-requests > li { .reverse-sort-btn { color: $gl-text-color-secondary; + + &.disabled { + color: $gl-text-color-disabled; + } } } diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 4d93702f1c2..b7d05fc411a 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -120,7 +120,7 @@ } .labels-container { - background-color: $gray-light; + background-color: $gray-100; border-radius: $border-radius-default; padding: $gl-padding $gl-padding-8; } diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index 81a70470c65..019d827798c 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -42,8 +42,7 @@ .login-box, .omniauth-container { box-shadow: 0 0 0 1px $border-color; - border-bottom-right-radius: $border-radius; - border-bottom-left-radius: $border-radius; + border-radius: $border-radius; padding: 15px; .login-heading h3 { diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index b99e619cc98..a62df1258af 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -221,7 +221,7 @@ $mr-widget-min-height: 69px; .mr-widget-pipeline-graph { .dropdown-menu { - z-index: 300; + z-index: $zindex-dropdown-menu; } } @@ -375,13 +375,14 @@ $mr-widget-min-height: 69px; } .text { - span { - font-weight: $gl-font-weight-bold; - } - p { margin-top: $gl-padding; } + + .highlight { + margin: 0 0 $gl-padding; + font-weight: $gl-font-weight-bold; + } } } @@ -981,7 +982,14 @@ $mr-widget-min-height: 69px; } .mini-pipeline-graph-dropdown-toggle, - .stage-cell .mini-pipeline-graph-dropdown-toggle svg { + .stage-cell .mini-pipeline-graph-dropdown-toggle svg, + // As the `mini-pipeline-item` mixin specificity is lower + // than the toggle of dropdown with 'variant="link"' we add + // classes ".gl-button.btn-link" to make it more specific. + // Once FF ci_mini_pipeline_gl_dropdown is removed, the `mini-pipeline-item` + // itself could increase its specificity to simplify this selector + button.gl-button.btn-link.mini-pipeline-graph-gl-dropdown-toggle, + .stage-cell button.gl-button.btn-link.mini-pipeline-graph-gl-dropdown-toggle svg { height: $ci-action-icon-size-lg; width: $ci-action-icon-size-lg; } diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 254ad96bb57..ffbfa47f9bd 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -212,8 +212,12 @@ table { } } -.note-edit-form { +// Snippets are the only non-vue form left +.snippets.note-edit-form { display: none; +} + +.note-edit-form { font-size: 14px; .md-area { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 4216091e8a9..190bdcb1efd 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -1,6 +1,5 @@ $system-note-icon-size: 32px; $system-note-svg-size: 16px; -$note-form-margin-left: 72px; @mixin vertical-line($left) { &::before { @@ -54,16 +53,6 @@ $note-form-margin-left: 72px; &.note-form { margin-left: 0; - @include notes-media('min', map-get($grid-breakpoints, md)) { - margin-left: $note-form-margin-left; - } - - .timeline-icon { - @include notes-media('min', map-get($grid-breakpoints, sm)) { - margin-left: -$note-icon-gutter-width; - } - } - .timeline-content { margin-left: 0; } @@ -84,36 +73,17 @@ $note-form-margin-left: 72px; .replies-toggle { background-color: $gray-light; padding: $gl-padding-8 $gl-padding; - border-top: 1px solid $gray-50; - border-bottom: 1px solid $gray-50; + border-top: 1px solid $gray-100; + border-bottom: 1px solid $gray-100; .collapse-replies-btn:hover { color: $blue-600; } - &.expanded { - span { - cursor: pointer; - } - - svg { - position: relative; - top: 3px; - } - } - &.collapsed { color: $gl-text-color-secondary; border-radius: 0 0 $border-radius-default $border-radius-default; - svg { - float: left; - position: relative; - top: $gl-padding-4; - margin-right: $gl-padding-8; - cursor: pointer; - } - img { margin: -2px 4px 0 0; } @@ -178,7 +148,6 @@ $note-form-margin-left: 72px; > li { display: block; position: relative; - border-bottom: 0; &.being-posted { pointer-events: none; @@ -549,21 +518,6 @@ $note-form-margin-left: 72px; .code-commit .notes-content, .diff-viewer > .image ~ .note-container { background-color: $white; - - .avatar-note-form-holder { - .user-avatar-link img { - margin: 13px $gl-padding $gl-padding; - } - - form, - ~ .discussion-form-container { - padding: $gl-padding; - - @include media-breakpoint-up(sm) { - margin-left: $note-icon-gutter-width; - } - } - } } .diff-viewer > .image ~ .note-container form.new-note { @@ -953,14 +907,6 @@ $note-form-margin-left: 72px; .discussion-filter-container { .dropdown-menu { margin-bottom: $gl-padding-4; - - @include media-breakpoint-down(md) { - margin-left: $btn-side-margin + $contextual-sidebar-collapsed-width; - } - - @include media-breakpoint-down(xs) { - margin-left: $btn-side-margin; - } } } diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 3605283245f..6a2fa2ee7a1 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -138,6 +138,13 @@ } } +.social-provider-btn-image { + > img { + width: 16px; + vertical-align: inherit; + } +} + .provider-btn-image { display: inline-block; padding: 5px 10px; @@ -378,19 +385,6 @@ table.u2f-registrations, display: inline; margin-right: $gl-padding / 4; } - - .badge-verification-status { - border-width: 1px; - border-style: solid; - - &.verified { - @include green-status-color; - } - - &.unverified { - @include status-color($gray-dark, color('gray'), $common-gray-dark); - } - } } .edit-user { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 7fafd28be56..8251cdb9bbb 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -571,10 +571,6 @@ top: 0; } } - - .btn-missing { - @extend .btn-missing; - } } } @@ -996,6 +992,20 @@ pre.light-well { width: auto; } } + + // Remove once gitlab/ui solution is implemented: + // https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1157 + // https://gitlab.com/gitlab-org/gitlab/-/issues/300405 + .gl-search-box-by-type-input { + width: 100%; + } + + // Remove once gitlab/ui solution is implemented + // https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1158 + // https://gitlab.com/gitlab-org/gitlab/-/issues/300405 + .gl-new-dropdown-button-text { + @include str-truncated; + } } .clearable-input { diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 352050f7b01..fa008a05e11 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -49,8 +49,6 @@ position: relative; .dropdown-menu { - min-width: 100%; - width: 100%; left: inherit; right: 0; } @@ -114,7 +112,7 @@ } th { - border-top-color: $gray-light; + border: 0; } td { |