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

[Jakub Steiner <jimmac src gnome org>]

commit e33b93a97e8ff6aa0ea14f5a4ee38b80e4aa3859
Author: Alex Monday <monday15 gmx com>
Date:   Sat Sep 1 19:25:41 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         |  6 ++++++
 gtk/theme/Adwaita/gtk-contained.css              |  6 ++++++
 gtk/theme/HighContrast/_common.scss              | 14 ++++++++++++++
 gtk/theme/HighContrast/gtk-contained-inverse.css |  6 ++++++
 gtk/theme/HighContrast/gtk-contained.css         |  6 ++++++
 6 files changed, 52 insertions(+)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 44cc7c1cf6..dd4687cb05 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -363,6 +363,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; }
@@ -389,6 +393,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; }
 
@@ -401,6 +408,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 d162188c16..6a718c33a0 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -140,6 +140,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: #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; }
@@ -150,10 +152,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: #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; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index e4e2ed5be8..d9dac827c2 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -140,6 +140,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: #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; }
@@ -150,10 +152,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: #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; }
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index b31388a08b..1f8457322c 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -291,6 +291,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; }
@@ -321,6 +325,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; }
 
@@ -333,6 +340,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 1d6d26fb5d..fadb1ce2d0 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -138,6 +138,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); }
@@ -148,10 +150,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 377e18930d..e0e6a58e8e 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -138,6 +138,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); }
@@ -148,10 +150,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 * */