From 5590bcb9cc630e339c6c7ff6776bdc2e0d9e09ac Mon Sep 17 00:00:00 2001 From: nana-4 Date: Wed, 27 Nov 2019 22:22:11 +0900 Subject: [PATCH] HighContrast: Add missing color to entry So entries don't inherit color from the parent element anymore. Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1646 --- gtk/theme/HighContrast/_drawing.scss | 1 + gtk/theme/HighContrast/gtk-contained-inverse.css | 4 ++-- gtk/theme/HighContrast/gtk-contained.css | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk/theme/HighContrast/_drawing.scss b/gtk/theme/HighContrast/_drawing.scss index 86617a721a..24efd5ef90 100644 --- a/gtk/theme/HighContrast/_drawing.scss +++ b/gtk/theme/HighContrast/_drawing.scss @@ -56,6 +56,7 @@ $_entry_edge: none; @if $t==normal { + color: $fg_color; border-color: $borders_color; @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%), $_entry_edge); diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index e4467931d2..92fca5415d 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -86,7 +86,7 @@ spinner:checked { opacity: 1; animation: spin 1s linear infinite; } spinner:checked:disabled { opacity: 0.5; } /**************** Text Entries * */ -spinbutton:not(.vertical), spinbutton.vertical text, entry { min-height: 32px; padding-left: 8px; padding-right: 8px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #090909, #111 90%); border-color: gray; box-shadow: inset 0 2px 2px -2px #090909; } +spinbutton:not(.vertical), spinbutton.vertical text, entry { min-height: 32px; padding-left: 8px; padding-right: 8px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #090909, #111 90%); color: #fff; border-color: gray; box-shadow: inset 0 2px 2px -2px #090909; } spinbutton:not(.vertical) image.left, spinbutton.vertical text image.left, entry image.left { padding-left: 0; padding-right: 6px; } @@ -1120,7 +1120,7 @@ progressbar progress.osd { border-width: 0; border-radius: 0; } progressbar trough.empty progress { all: unset; } /************* Level Bar * */ -levelbar trough { padding: 2px; border-radius: 3px; background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #090909, #111 90%); border-color: gray; box-shadow: inset 0 2px 2px -2px #090909; } +levelbar trough { padding: 2px; border-radius: 3px; background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #090909, #111 90%); color: #fff; border-color: gray; box-shadow: inset 0 2px 2px -2px #090909; } levelbar trough:backdrop { background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #090909, #111 90%); color: #fff; background-image: linear-gradient(to bottom, #111, #111); box-shadow: 0 1px rgba(255, 255, 255, 0); } diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index f9c3a11048..faa1ba4698 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -86,7 +86,7 @@ spinner:checked { opacity: 1; animation: spin 1s linear infinite; } spinner:checked:disabled { opacity: 0.5; } /**************** Text Entries * */ -spinbutton:not(.vertical), spinbutton.vertical text, entry { min-height: 32px; padding-left: 8px; padding-right: 8px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); border-color: gray; box-shadow: inset 0 2px 2px -2px gray; } +spinbutton:not(.vertical), spinbutton.vertical text, entry { min-height: 32px; padding-left: 8px; padding-right: 8px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); color: #000; border-color: gray; box-shadow: inset 0 2px 2px -2px gray; } spinbutton:not(.vertical) image.left, spinbutton.vertical text image.left, entry image.left { padding-left: 0; padding-right: 6px; } @@ -1126,7 +1126,7 @@ progressbar progress.osd { border-width: 0; border-radius: 0; } progressbar trough.empty progress { all: unset; } /************* Level Bar * */ -levelbar trough { padding: 2px; border-radius: 3px; background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); border-color: gray; box-shadow: inset 0 2px 2px -2px gray; } +levelbar trough { padding: 2px; border-radius: 3px; background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); color: #000; border-color: gray; box-shadow: inset 0 2px 2px -2px gray; } levelbar trough:backdrop { background-color: transparent; border-style: solid; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); color: #000; background-image: linear-gradient(to bottom, #fff, #fff); box-shadow: 0 1px rgba(255, 255, 255, 0); }