diff options
Diffstat (limited to 'app/assets/stylesheets')
23 files changed, 48 insertions, 98 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 7931f4deea0..1fe94a796f5 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -42,7 +42,6 @@ @import 'framework/notes'; @import 'framework/tabs'; @import 'framework/timeline'; -@import 'framework/tooltips'; @import 'framework/toggle'; @import 'framework/typography'; @import 'framework/zen'; diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index b51fec925cb..91af41c68dd 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -216,6 +216,7 @@ color: $gray-700; } + // deprecated class &.btn-text-field { width: 100%; text-align: left; diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index e30caeb1dfb..bd15022eadf 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -1035,7 +1035,6 @@ table.code { auto; // Retina cursor - // scss-lint:disable DuplicateProperty cursor: image-set(image-url('illustrations/image_comment_light_cursor.svg') 1x, image-url('illustrations/image_comment_light_cursor@2x.svg') 2x) $image-comment-cursor-left-offset $image-comment-cursor-top-offset, auto; diff --git a/app/assets/stylesheets/framework/editor-lite.scss b/app/assets/stylesheets/framework/editor-lite.scss index c3b287a6c3d..eda3e33a6aa 100644 --- a/app/assets/stylesheets/framework/editor-lite.scss +++ b/app/assets/stylesheets/framework/editor-lite.scss @@ -3,6 +3,11 @@ @include gl-display-flex; @include gl-justify-content-center; @include gl-align-items-center; + @include gl-z-index-0; + + > * { + filter: blur(5px); + } &::before { content: ''; diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 07d59847829..5803b274d9b 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -453,7 +453,7 @@ .search-token-target-branch { .value { font-family: $monospace-font; - font-size: 13px; + font-size: $gl-font-size-monospace; } } diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss index cac3695e1a1..4f9896dd58a 100644 --- a/app/assets/stylesheets/framework/layout.scss +++ b/app/assets/stylesheets/framework/layout.scss @@ -8,9 +8,8 @@ html { body { // Improves readability for dyslexic users; supported only in Chrome/Safari so far - // scss-lint:disable PropertySpelling text-decoration-skip: ink; - // scss-lint:enable PropertySpelling + &.navless { background-color: $white !important; } diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index b0334da6943..b81e9828dec 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -283,12 +283,6 @@ ul.indent-list { to { transform: rotate(360deg); } } -.namespace-title { - .tooltip-inner { - max-width: 350px; - } -} - .horizontal-list { padding-left: 0; list-style: none; diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index e29e204b14f..1e2fc1445e8 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -433,7 +433,6 @@ @mixin middle-dot-divider { &::after { // Duplicate `content` property used as a fallback - // scss-lint:disable DuplicateProperty content: '\00B7'; // middle dot fallback if browser does not support alternative content content: '\00B7' / ''; // tell screen readers to ignore the content https://www.w3.org/TR/css-content-3/#accessibility padding: 0 0.375rem; diff --git a/app/assets/stylesheets/framework/tooltips.scss b/app/assets/stylesheets/framework/tooltips.scss deleted file mode 100644 index edc2fb532c8..00000000000 --- a/app/assets/stylesheets/framework/tooltips.scss +++ /dev/null @@ -1,6 +0,0 @@ -.tooltip-inner { - font-size: $gl-font-size-small; - border-radius: $border-radius-default; - line-height: $gl-line-height; - font-weight: $gl-font-weight-normal; -} diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 496e2aba421..4852700d878 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -78,7 +78,7 @@ code { font-family: $monospace-font; white-space: pre-wrap; - word-wrap: normal; + overflow-wrap: break-word; word-break: keep-all; } @@ -604,7 +604,7 @@ pre { display: block; padding: $gl-padding-8 $input-horizontal-padding; margin: 0 0 $gl-padding-8; - font-size: 13px; + font-size: $gl-font-size-monospace; word-break: break-all; word-wrap: break-word; color: $gl-text-color; @@ -646,7 +646,7 @@ code { */ textarea.js-gfm-input { font-family: $monospace-font; - font-size: 13px; + font-size: $gl-font-size-monospace; } .strikethrough { @@ -699,13 +699,11 @@ textarea { opacity: 1; // FF defaults to 0.54 } - // scss-lint:disable PseudoElement // support Edge vendor prefix &::-ms-input-placeholder { color: $gl-text-color-tertiary; } - // scss-lint:disable PseudoElement // support IE vendor prefix &:-ms-input-placeholder { color: $gl-text-color-tertiary; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 4bf9236407f..089f130843f 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -443,7 +443,7 @@ $gl-avatar-size: 40px; $border-radius-default: 4px; $border-radius-small: 2px; $border-radius-large: 8px; -$default-icon-size: 18px; +$default-icon-size: 16px; $layout-link-gray: #7e7c7c; $btn-side-margin: 10px; $btn-sm-side-margin: 7px; diff --git a/app/assets/stylesheets/highlight/conflict_colors.scss b/app/assets/stylesheets/highlight/conflict_colors.scss index 98ca3775b72..910dc6f4ad6 100644 --- a/app/assets/stylesheets/highlight/conflict_colors.scss +++ b/app/assets/stylesheets/highlight/conflict_colors.scss @@ -1,5 +1,4 @@ // Disabled to use the color map for creating color schemes -// scss-lint:disable ColorVariable $conflict-colors: ( white-header-head-neutral : #e1fad7, white-line-head-neutral : #effdec, @@ -116,4 +115,3 @@ $conflict-colors: ( none_line_not_chosen : $gray-light ); -// scss-lint:enable ColorVariable diff --git a/app/assets/stylesheets/mailer_client_specific.scss b/app/assets/stylesheets/mailer_client_specific.scss index 41bedecf90f..0547aa7752f 100644 --- a/app/assets/stylesheets/mailer_client_specific.scss +++ b/app/assets/stylesheets/mailer_client_specific.scss @@ -3,7 +3,6 @@ // These are client-specific rules, ignore some linting rules // // stylelint-disable property-no-vendor-prefix, property-no-unknown, length-zero-no-unit -// scss-lint:disable PropertySpelling, ZeroUnit body, table, diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss index 7c4d51ab677..009019a45d9 100644 --- a/app/assets/stylesheets/page_bundles/ide.scss +++ b/app/assets/stylesheets/page_bundles/ide.scss @@ -1043,8 +1043,7 @@ $ide-commit-header-height: 48px; .input-icon { right: auto; left: 10px; - top: 50%; - transform: translateY(-50%); + top: 1rem; } } diff --git a/app/assets/stylesheets/page_bundles/jira_connect.scss b/app/assets/stylesheets/page_bundles/jira_connect.scss index 25401a161da..eb2dd6e578e 100644 --- a/app/assets/stylesheets/page_bundles/jira_connect.scss +++ b/app/assets/stylesheets/page_bundles/jira_connect.scss @@ -20,36 +20,23 @@ @import '@gitlab/ui/src/components/base/tooltip/tooltip'; $atlaskit-border-color: #dfe1e6; +$header-height: 40px; -.ac-content { - margin: 20px; - - .subscription-form { - margin-bottom: 20px; - - .field-group-input { - display: flex; - padding-top: $gl-padding-4; +.subscription-form { + .field-group-input { + display: flex; + padding-top: $gl-padding-4; - .ak-button { - align-items: center; - height: auto; - margin-left: $btn-margin-5; - } + .ak-button { + align-items: center; + height: auto; + margin-left: $btn-margin-5; } } } -$header-height: 40px; - .jira-connect-header { - border-bottom: 1px solid $gray-100; - display: flex; - align-items: center; - justify-content: center; min-height: $header-height; - padding-left: 16px; - padding-right: 16px; position: fixed; top: 0; left: 0; @@ -57,7 +44,6 @@ $header-height: 40px; } .jira-connect-user { - font-size: $gl-font-size; position: fixed; top: 10px; right: 20px; @@ -65,20 +51,17 @@ $header-height: 40px; .jira-connect-app { margin-top: $header-height; + height: calc(100% - #{$header-height}); + max-width: 1000px; +} + +.jira-connect-app-body { max-width: 600px; - min-height: 95vh; - padding-top: 48px; - padding-left: 16px; - padding-right: 16px; margin-left: auto; margin-right: auto; - text-align: center; -} - -.gl-mt-5 { - margin-top: 16px; } +// for external_link buttons svg { fill: currentColor; @@ -115,12 +98,3 @@ svg { } } } - -.empty-subscriptions { - color: $gray-900; -} - -.browser-limitations-notice { - font-size: $gl-font-size; - margin-top: 32px; -} diff --git a/app/assets/stylesheets/page_bundles/signup.scss b/app/assets/stylesheets/page_bundles/signup.scss index a207c10b04f..d6c3a3ff5da 100644 --- a/app/assets/stylesheets/page_bundles/signup.scss +++ b/app/assets/stylesheets/page_bundles/signup.scss @@ -32,11 +32,6 @@ @include media-breakpoint-down(md) { width: 100%; } - - img { - width: $default-icon-size; - height: $default-icon-size; - } } .decline-page { diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index f7b8a4c5b84..98074f8af29 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -105,6 +105,7 @@ border: 0; &.table-row-header { + // stylelint-disable-next-line background-color: none; border: 0; font-weight: bold; diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index 019d827798c..2d04354a99d 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -106,17 +106,6 @@ width: 100%; } } - - .omniauth-btn { - width: 100%; - padding: $gl-padding-8; - - img { - width: $default-icon-size; - height: $default-icon-size; - margin-right: $gl-padding; - } - } } .new-session-tabs { diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index a62df1258af..c20d795b810 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -4,6 +4,7 @@ */ $mr-widget-min-height: 69px; +$tabs-holder-z-index: 250; .space-children { @include clearfix; @@ -675,7 +676,7 @@ $mr-widget-min-height: 69px; .mr-version-controls { position: relative; - z-index: 203; + z-index: $tabs-holder-z-index + 10; background: $white; color: $gl-text-color; margin-top: -1px; @@ -745,7 +746,7 @@ $mr-widget-min-height: 69px; .merge-request-tabs-holder, .epic-tabs-holder { top: $header-height; - z-index: 250; + z-index: $tabs-holder-z-index; background-color: $body-bg; border-bottom: 1px solid $border-color; diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index ffbfa47f9bd..b1bd15e0bd7 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -302,8 +302,21 @@ table { width: 100%; } } +} + +.discussion-reply-holder { + .reply-placeholder-text-field { + font-family: $monospace-font; + font-size: $gl-font-size-monospace; + border-radius: $gl-border-radius-base; + width: 100%; + resize: none; + padding: $gl-padding-8 $gl-padding-12; + line-height: 1; + border: 1px solid $border-color; + background-color: $white; + overflow: hidden; - .btn-text-field { @include media-breakpoint-down(xs) { margin-bottom: $gl-padding-8; } diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss index 4b88b94f3a6..6b78abdb5e0 100644 --- a/app/assets/stylesheets/startup/startup-signin.scss +++ b/app/assets/stylesheets/startup/startup-signin.scss @@ -2142,11 +2142,6 @@ table.code { width: 100%; padding: 8px; } -.login-page .omniauth-container .omniauth-btn img { - width: 1.125rem; - height: 1.125rem; - margin-right: 16px; -} .login-page .new-session-tabs { display: flex; box-shadow: 0 0 0 1px #dbdbdb; diff --git a/app/assets/stylesheets/themes/theme_helper.scss b/app/assets/stylesheets/themes/theme_helper.scss index 417377b514e..aae9f3ded4f 100644 --- a/app/assets/stylesheets/themes/theme_helper.scss +++ b/app/assets/stylesheets/themes/theme_helper.scss @@ -92,6 +92,7 @@ .notification-dot { will-change: border-color, background-color; + // stylelint-disable-next-line border-color: $nav-svg-color + 33; } diff --git a/app/assets/stylesheets/vendors/atwho.scss b/app/assets/stylesheets/vendors/atwho.scss index f31dbbeafe8..b92331facee 100644 --- a/app/assets/stylesheets/vendors/atwho.scss +++ b/app/assets/stylesheets/vendors/atwho.scss @@ -1,6 +1,7 @@ .atwho-view { overflow-y: auto; overflow-x: hidden; + max-width: calc(100% - 6px); .name, small.aliases, @@ -80,10 +81,6 @@ } @include media-breakpoint-down(xs) { - .atwho-view-ul { - width: 350px; - } - .atwho-view ul li { overflow: hidden; text-overflow: ellipsis; |