[gtk: 1/2] themes: Fix linked elements in error state

[Jakub Steiner <jimmac src gnome org>]

commit 3e5746356e10088a20aa158044f27e43c2e9eec6
Author: Alex Monday <monday15 gmx com>
Date:   Sat Sep 1 19:52:19 2018 +0500

    themes: Fix linked elements in error state
    
    Add instructions for color of linked elements border which ajoints
    entry, when parent linked entry is in error state.

 gtk/theme/Adwaita/_common.scss                   | 14 ++++++++++++++
 gtk/theme/Adwaita/gtk-contained-dark.css         | 10 ++++++++++
 gtk/theme/Adwaita/gtk-contained.css              | 10 ++++++++++
 gtk/theme/HighContrast/_common.scss              | 14 ++++++++++++++
 gtk/theme/HighContrast/gtk-contained-inverse.css |  6 ++++++
 gtk/theme/HighContrast/gtk-contained.css         |  6 ++++++
 6 files changed, 60 insertions(+)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 15a228e0b6..782d2e2d83 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -371,6 +371,10 @@ entry {
   .linked:not(.vertical) > &:focus + button,
   .linked:not(.vertical) > &:focus + combobox > box > button.combo { border-left-color: 
entry_focus_border(); }
 
+  .linked:not(.vertical) > &:focus.error + &,
+  .linked:not(.vertical) > &:focus.error + button,
+  .linked:not(.vertical) > &:focus.error + combobox > box > button.combo { border-left-color: 
entry_focus_border($error_color); }
+
   .linked:not(.vertical) > &:drop(active) + &,
   .linked:not(.vertical) > &:drop(active) + button,
   .linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: 
$drop_target_color; }
@@ -397,6 +401,9 @@ entry {
     + %entry:focus:not(:only-child),
     + entry:focus:not(:only-child) { border-top-color: entry_focus_border(); }
 
+    + %entry:focus.error:not(:only-child),
+    + entry:focus.error:not(:only-child) { border-top-color: entry_focus_border($error_color); }
+
     + %entry:drop(active):not(:only-child),
     + entry:drop(active):not(:only-child) { border-top-color: $drop_target_color; }
 
@@ -409,6 +416,13 @@ entry {
       + combobox > box > button.combo { border-top-color: entry_focus_border(); }
     }
 
+    &:focus.error:not(:only-child) {
+      + %entry,
+      + entry,
+      + button,
+      + combobox > box > button.combo { border-top-color: entry_focus_border($error_color); }
+    }
+
     &:drop(active):not(:only-child) {
       + %entry,
       + entry,
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 32ea468f42..6af8988573 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -152,6 +152,8 @@ spinbutton:not(.vertical) progress > trough > progress:backdrop, entry progress
 
 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) 
> spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + 
combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), 
.linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > 
button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) > 
entry:focus + entry { border-left-color: #0f2b48; }
 
+.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + button, 
.linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + entry { 
border-left-color: #1a0000; }
+
 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + button, 
.linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + entry { 
border-left-color: #4e9a06; }
 
 .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > 
spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > 
entry:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + 
spinbutton:not(:disabled):not(.vertical) { border-top-color: #212426; }
@@ -162,10 +164,14 @@ spinbutton:not(.vertical) progress > trough > progress:backdrop, entry progress
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + 
spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { 
border-top-color: #0f2b48; }
 
+.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + 
spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:focus.error:not(:only-child) { border-top-color: #1a0000; }
+
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry 
+ spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:drop(active):not(:only-child) { border-top-color: #4e9a06; }
 
 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + 
entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > 
entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #0f2b48; }
 
+.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, 
.linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: 
#1a0000; }
+
 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, 
.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: 
#4e9a06; }
 
 treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { background-color: #232729; 
transition-property: color, background; }
@@ -686,6 +692,10 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen
 
 .titlebar:not(headerbar) > separator { background-color: #1b1f20; }
 
+window.devel headerbar { background: transparent -gtk-icontheme("system-run-symbolic") 80% 0/128px 128px 
no-repeat, linear-gradient(to left, #2a4b6c 8%, #33393b 25%); color: rgba(238, 238, 236, 0.1); }
+
+window.devel headerbar label { color: #eeeeec; }
+
 /************ Pathbars * */
 .path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; 
padding-right: 4px; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1126820c01..757ad18b92 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -152,6 +152,8 @@ spinbutton:not(.vertical) progress > trough > progress:backdrop, entry progress
 
 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) 
> spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + 
combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), 
.linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > 
button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) > 
entry:focus + entry { border-left-color: #4a90d9; }
 
+.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + button, 
.linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + entry { 
border-left-color: #cc0000; }
+
 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + button, 
.linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + entry { 
border-left-color: #4e9a06; }
 
 .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > 
spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > 
entry:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + 
spinbutton:not(:disabled):not(.vertical) { border-top-color: #e9e9e8; }
@@ -162,10 +164,14 @@ spinbutton:not(.vertical) progress > trough > progress:backdrop, entry progress
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + 
spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { 
border-top-color: #4a90d9; }
 
+.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + 
spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:focus.error:not(:only-child) { border-top-color: #cc0000; }
+
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry 
+ spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:drop(active):not(:only-child) { border-top-color: #4e9a06; }
 
 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + 
entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > 
entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #4a90d9; }
 
+.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, 
.linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: 
#cc0000; }
+
 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, 
.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: 
#4e9a06; }
 
 treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { background-color: #ffffff; 
transition-property: color, background; }
@@ -694,6 +700,10 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen
 
 .titlebar:not(headerbar) > separator { background-color: #b6b6b3; }
 
+window.devel headerbar { background: transparent -gtk-icontheme("system-run-symbolic") 80% 0/128px 128px 
no-repeat, linear-gradient(to left, #99bce0 8%, #e8e8e7 25%); color: rgba(46, 52, 54, 0.1); }
+
+window.devel headerbar label { color: #2e3436; }
+
 /************ Pathbars * */
 .path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; 
padding-right: 4px; }
 
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index a20e685eaf..c5b64ed635 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -290,6 +290,10 @@ entry {
   .linked:not(.vertical) > &:focus + button,
   .linked:not(.vertical) > &:focus + combobox > box > button.combo { border-left-color: 
entry_focus_border(); }
 
+  .linked:not(.vertical) > &:focus.error + &,
+  .linked:not(.vertical) > &:focus.error + button,
+  .linked:not(.vertical) > &:focus.error + combobox > box > button.combo { border-left-color: $error_color; }
+
   .linked:not(.vertical) > &:drop(active) + &,
   .linked:not(.vertical) > &:drop(active) + button,
   .linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $fg_color; }
@@ -320,6 +324,9 @@ entry {
     + %entry:focus:not(:only-child),
     + entry:focus:not(:only-child) { border-top-color: entry_focus_border(); }
 
+    + %entry:focus.error:not(:only-child),
+    + entry:focus.error:not(:only-child) { border-top-color: $error_color; }
+
     + %entry:drop(active):not(:only-child),
     + entry:drop(active):not(:only-child) { border-top-color: $fg_color; }
 
@@ -332,6 +339,13 @@ entry {
       + combobox > box > button.combo { border-top-color: entry_focus_border(); }
     }
 
+    &:focus.error:not(:only-child) {
+      + %entry,
+      + entry,
+      + button,
+      + combobox > box > button.combo { border-top-color: $error_color; }
+    }
+
     &:drop(active):not(:only-child) {
       + %entry,
       + entry,
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css 
b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 22c62e44ee..62fa1c3522 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -144,6 +144,8 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
 
 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) 
> spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + 
combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), 
.linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > 
button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) > 
entry:focus + entry { border-left-color: #aaa; }
 
+.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + button, 
.linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + entry { 
border-left-color: #cc0000; }
+
 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + button, 
.linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + entry { 
border-left-color: #fff; }
 
 .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > 
spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > 
entry:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + 
spinbutton:not(:disabled):not(.vertical) { border-top-color: #323232; background-image: linear-gradient(to 
bottom, #111, #111); }
@@ -154,10 +156,14 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + 
spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { 
border-top-color: #aaa; }
 
+.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + 
spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:focus.error:not(:only-child) { border-top-color: #cc0000; }
+
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry 
+ spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:drop(active):not(:only-child) { border-top-color: #fff; }
 
 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + 
entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > 
entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #aaa; }
 
+.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, 
.linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: 
#cc0000; }
+
 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, 
.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: 
#fff; }
 
 /*********** Buttons * */
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 343d9c2179..7ee26f1235 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -144,6 +144,8 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
 
 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) 
> spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + 
combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), 
.linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > 
button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) > 
entry:focus + entry { border-left-color: #000; }
 
+.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + button, 
.linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + entry { 
border-left-color: #cc0000; }
+
 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + button, 
.linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + entry { 
border-left-color: #000; }
 
 .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > 
spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > 
entry:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + 
spinbutton:not(:disabled):not(.vertical) { border-top-color: #d9d9d9; background-image: linear-gradient(to 
bottom, #fff, #fff); }
@@ -154,10 +156,14 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + 
spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { 
border-top-color: #000; }
 
+.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + 
spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:focus.error:not(:only-child) { border-top-color: #cc0000; }
+
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry 
+ spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:drop(active):not(:only-child) { border-top-color: #000; }
 
 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + 
entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > 
entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #000; }
 
+.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, 
.linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: 
#cc0000; }
+
 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, 
.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: 
#000; }
 
 /*********** Buttons * */