diff --git a/app/assets/stylesheets/components/design_management/design.scss b/app/assets/stylesheets/components/design_management/design.scss index 380b22804903e800eefe824dfc2fb7bc1aee2df2..77354456fe537c6dbc2039f9b34ce3b32870723e 100644 --- a/app/assets/stylesheets/components/design_management/design.scss +++ b/app/assets/stylesheets/components/design_management/design.scss @@ -151,6 +151,7 @@ .design-dropzone-card { transition: border $general-hover-transition-duration $general-hover-transition-curve; + color: $gl-text-color; &:focus, &:active { diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 44c8ace90407e5a2f6ae806a17730c6ee6b226a2..eebd3ce654e4366005a21a271042c85cc343597d 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -4,6 +4,8 @@ textarea { input { border-radius: $border-radius-base; + color: $gl-text-color; + background-color: $input-bg; } input[type='text'].danger { diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index ff6ac87db76ca767d62bf94cd47d5e43031c646d..1504f3ee50fd7871c1c0e997ef01abec5ce2e59b 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/app/assets/stylesheets/framework/timeline.scss @@ -27,7 +27,13 @@ .timeline-entry { color: $gl-text-color; - background-color: $white; + + // [dark-theme]: only give background color to actual notes + // in the timeline, the note form textarea has a background + // of it's own + &:not(.note-form) { + background-color: $white; + } .timeline-entry-inner { position: relative; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 22cafc8d1fe89d907ccef761a5e16588869e4cad..fc64dae14ebe92f97b576ed53c4b86c341367764 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -479,9 +479,9 @@ $gl-btn-active-gradient: inset 0 2px 3px $gl-btn-active-background; $added: #63c363; $deleted: #f77; $line-added: #ecfdf0; -$line-added-dark: #c7f0d2; +$line-added-dark: #c7f0d2 !default; $line-removed: #fbe9eb; -$line-removed-dark: #fac5cd; +$line-removed-dark: #fac5cd !default; $line-number-old: #f9d7dc; $line-number-new: #ddfbe6; $line-number-select: #fbf2da; diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss index c7a50bdb5a364b9d8318230b8ebc32233014bc7a..fc5a30a5d7b37f79e330f607f72f627b8f6907a4 100644 --- a/app/assets/stylesheets/framework/variables_overrides.scss +++ b/app/assets/stylesheets/framework/variables_overrides.scss @@ -14,7 +14,7 @@ $btn-line-height: 20px; $table-accent-bg: $gray-light; $table-border-color: $gray-200; $card-border-color: $border-color; -$card-cap-bg: $gray-light; +$card-cap-bg: $gray-light !default; $success: $green-500; $info: $blue-500; $warning: $orange-500; diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 2334be02986b693b76b34e425c44027a724337cc..aebc5cb757a889b9c120eb2fa3bd69da2fcfcebd 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -62,7 +62,8 @@ background-color: $white; &.is-focused { - @extend .form-control:focus; + border-color: $input-focus-border-color; + box-shadow: $input-focus-box-shadow; .comment-toolbar, .nav-links { diff --git a/app/assets/stylesheets/themes/_dark.scss b/app/assets/stylesheets/themes/_dark.scss index 1cea469e206ef7c52c72098ecc7b220d311c3c4f..e2b4d6b8e7aada0b985601c3347f44eabdfc2967 100644 --- a/app/assets/stylesheets/themes/_dark.scss +++ b/app/assets/stylesheets/themes/_dark.scss @@ -103,6 +103,8 @@ $input-focus-bg: $gray-100; $input-color: $gray-900; $input-group-addon-bg: $gray-900; +$card-cap-bg: $gray-50; + $tooltip-bg: $gray-800; $tooltip-color: $gray-10; @@ -118,6 +120,11 @@ $issues-today-border: #333a40; $yiq-text-dark: $gray-50; $yiq-text-light: $gray-950; +// Commit Diff Colors +$line-added-dark: $green-200; +$line-removed-dark: $red-200; + +// Misc component overrides that should live elsewhere .gl-label { filter: brightness(0.9) contrast(1.1); } diff --git a/changelogs/unreleased/psi-dark-mode-issue-fixes.yml b/changelogs/unreleased/psi-dark-mode-issue-fixes.yml new file mode 100644 index 0000000000000000000000000000000000000000..da513844bc4aaf4dfb7f5ae45ec609a098e3338c --- /dev/null +++ b/changelogs/unreleased/psi-dark-mode-issue-fixes.yml @@ -0,0 +1,5 @@ +--- +title: Minor UI fixes for Issue page in dark mode +merge_request: 35395 +author: +type: fixed