Commit acf5e90f authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'psi-dark-mode-issue-fixes' into 'master'

Minor UI fixes for Issue page in dark mode

Closes #223729, #223143, and #223721

See merge request gitlab-org/gitlab!35395
parents 2cc60118 ed2ca16b
...@@ -151,6 +151,7 @@ ...@@ -151,6 +151,7 @@
.design-dropzone-card { .design-dropzone-card {
transition: border $general-hover-transition-duration $general-hover-transition-curve; transition: border $general-hover-transition-duration $general-hover-transition-curve;
color: $gl-text-color;
&:focus, &:focus,
&:active { &:active {
......
...@@ -4,6 +4,8 @@ textarea { ...@@ -4,6 +4,8 @@ textarea {
input { input {
border-radius: $border-radius-base; border-radius: $border-radius-base;
color: $gl-text-color;
background-color: $input-bg;
} }
input[type='text'].danger { input[type='text'].danger {
......
...@@ -27,7 +27,13 @@ ...@@ -27,7 +27,13 @@
.timeline-entry { .timeline-entry {
color: $gl-text-color; 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 { .timeline-entry-inner {
position: relative; position: relative;
......
...@@ -479,9 +479,9 @@ $gl-btn-active-gradient: inset 0 2px 3px $gl-btn-active-background; ...@@ -479,9 +479,9 @@ $gl-btn-active-gradient: inset 0 2px 3px $gl-btn-active-background;
$added: #63c363; $added: #63c363;
$deleted: #f77; $deleted: #f77;
$line-added: #ecfdf0; $line-added: #ecfdf0;
$line-added-dark: #c7f0d2; $line-added-dark: #c7f0d2 !default;
$line-removed: #fbe9eb; $line-removed: #fbe9eb;
$line-removed-dark: #fac5cd; $line-removed-dark: #fac5cd !default;
$line-number-old: #f9d7dc; $line-number-old: #f9d7dc;
$line-number-new: #ddfbe6; $line-number-new: #ddfbe6;
$line-number-select: #fbf2da; $line-number-select: #fbf2da;
......
...@@ -14,7 +14,7 @@ $btn-line-height: 20px; ...@@ -14,7 +14,7 @@ $btn-line-height: 20px;
$table-accent-bg: $gray-light; $table-accent-bg: $gray-light;
$table-border-color: $gray-200; $table-border-color: $gray-200;
$card-border-color: $border-color; $card-border-color: $border-color;
$card-cap-bg: $gray-light; $card-cap-bg: $gray-light !default;
$success: $green-500; $success: $green-500;
$info: $blue-500; $info: $blue-500;
$warning: $orange-500; $warning: $orange-500;
......
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
background-color: $white; background-color: $white;
&.is-focused { &.is-focused {
@extend .form-control:focus; border-color: $input-focus-border-color;
box-shadow: $input-focus-box-shadow;
.comment-toolbar, .comment-toolbar,
.nav-links { .nav-links {
......
...@@ -103,6 +103,8 @@ $input-focus-bg: $gray-100; ...@@ -103,6 +103,8 @@ $input-focus-bg: $gray-100;
$input-color: $gray-900; $input-color: $gray-900;
$input-group-addon-bg: $gray-900; $input-group-addon-bg: $gray-900;
$card-cap-bg: $gray-50;
$tooltip-bg: $gray-800; $tooltip-bg: $gray-800;
$tooltip-color: $gray-10; $tooltip-color: $gray-10;
...@@ -118,6 +120,11 @@ $issues-today-border: #333a40; ...@@ -118,6 +120,11 @@ $issues-today-border: #333a40;
$yiq-text-dark: $gray-50; $yiq-text-dark: $gray-50;
$yiq-text-light: $gray-950; $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 { .gl-label {
filter: brightness(0.9) contrast(1.1); filter: brightness(0.9) contrast(1.1);
} }
......
---
title: Minor UI fixes for Issue page in dark mode
merge_request: 35395
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment