[gtk] themes: Remove leftover bit of .linked workaround

[Daniel Boles <dboles src gnome org>]

commit 8aeced2c914d773d2406412a33fee34d78102a6a
Author: Daniel Boles <dboles src gmail com>
Date:   Wed Jun 20 20:11:26 2018 +0100

    themes: Remove leftover bit of .linked workaround
    
    Now that .linked acts like the .path-bar already did, there is no point
    in applying the same styles again (with higher specificity).

 gtk/theme/Adwaita/_common.scss                   | 7 -------
 gtk/theme/Adwaita/gtk-contained-dark.css         | 8 ++++----
 gtk/theme/Adwaita/gtk-contained.css              | 8 ++++----
 gtk/theme/HighContrast/_common.scss              | 7 -------
 gtk/theme/HighContrast/gtk-contained-inverse.css | 8 ++++----
 gtk/theme/HighContrast/gtk-contained.css         | 8 ++++----
 6 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a9b9223fac..52461e0789 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1700,13 +1700,6 @@ headerbar { // headerbar border rounding
  * Pathbars *
  ************/
 
-// GtkPathBar does not work with just .linked, so we must override that. But we
-// can’t simply remove .linked from the widget as that might break other themes.
-// Note also we select on filechooser to avoid interfering with NautilusPathBar.
-filechooser .path-bar.linked > button {
-  @extend %linked;
-}
-
 .path-bar button {
   &.text-button, &.image-button, & {
     padding-left: 4px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 2e98bde643..d5222330b1 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -430,13 +430,13 @@ button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {
 
 .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > 
button:backdrop:disabled:checked label { color: #566164; }
 
-toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, 
.linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, 
.inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 
button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > 
button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; 
border-right-style: none; }
+toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, 
.linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, 
.inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 
button:checked, .linked > button:backdrop, .linked > combobox > box > button.combo:dir(ltr), .linked > 
combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:dir(ltr):first-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):first-child, .inline-toolbar button:dir(ltr):first-child, .linked > 
button:dir(ltr):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), 
toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat:dir(ltr), combobox.linked 
button:dir(ltr):nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(ltr), filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > 
spinbutton:dir(rtl):last-child:not(.vertical), .linked:not(.vertical) > entry:dir(rtl):last-child, 
.inline-toolbar button:dir(rtl):last-child, .linked > button:dir(rtl):last-child, toolbar.inline-toolbar 
toolbutton:last-child > button.flat:dir(rtl), toolbar.inline-toolbar toolbutton:backdrop:last-child > 
button.flat:dir(rtl), .linked:not(.vertical) > combobox:last-child > box > button.combo:dir(rtl), filechoos
 er .path
 -bar.linked > button:dir(rtl):last-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; 
border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }
+.linked:not(.vertical) > spinbutton:dir(ltr):first-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):first-child, .inline-toolbar button:dir(ltr):first-child, .linked > 
button:dir(ltr):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), 
toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat:dir(ltr), combobox.linked 
button:dir(ltr):nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):last-child:not(.vertical), 
.linked:not(.vertical) > entry:dir(rtl):last-child, .inline-toolbar button:dir(rtl):last-child, .linked > 
button:dir(rtl):last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(rtl), 
toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(rtl), .linked:not(.vertical) > 
combobox:last-child > box > button.combo:dir(rtl) { border-top-left-radius: 3px; border-bottom-left-radius: 
3px; border-
 top-righ
 t-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:dir(ltr):last-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):last-child, .inline-toolbar button:dir(ltr):last-child, .linked > button:dir(ltr):last-child, 
toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(ltr), toolbar.inline-toolbar 
toolbutton:backdrop:last-child > button.flat:dir(ltr), combobox.linked button:dir(ltr):nth-child(2), 
.linked:not(.vertical) > combobox:last-child > box > button.combo:dir(ltr), filechooser .path-bar.linked > 
button:dir(ltr):last-child, .linked:not(.vertical) > spinbutton:dir(rtl):first-child:not(.vertical), 
.linked:not(.vertical) > entry:dir(rtl):first-child, .inline-toolbar button:dir(rtl):first-child, .linked > 
button:dir(rtl):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(rtl), 
toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat:dir(rtl), combobox.linked 
button:dir(rtl):nth-child(2), .linked:not(.vertical) > combobox:first-child > bo
 x > butt
 on.combo:dir(rtl), filechooser .path-bar.linked > button:dir(rtl):first-child { border-top-left-radius: 0; 
border-bottom-left-radius: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; 
border-right-style: solid; }
+.linked:not(.vertical) > spinbutton:dir(ltr):last-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):last-child, .inline-toolbar button:dir(ltr):last-child, .linked > button:dir(ltr):last-child, 
toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(ltr), toolbar.inline-toolbar 
toolbutton:backdrop:last-child > button.flat:dir(ltr), combobox.linked button:dir(ltr):nth-child(2), 
.linked:not(.vertical) > combobox:last-child > box > button.combo:dir(ltr), .linked:not(.vertical) > 
spinbutton:dir(rtl):first-child:not(.vertical), .linked:not(.vertical) > entry:dir(rtl):first-child, 
.inline-toolbar button:dir(rtl):first-child, .linked > button:dir(rtl):first-child, toolbar.inline-toolbar 
toolbutton:first-child > button.flat:dir(rtl), toolbar.inline-toolbar toolbutton:backdrop:first-child > 
button.flat:dir(rtl), combobox.linked button:dir(rtl):nth-child(2), .linked:not(.vertical) > 
combobox:first-child > box > button.combo:dir(rtl) { border-top-left-radius: 0; bord
 er-botto
 m-left-radius: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; }
 
-.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
> button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > 
combobox:only-child > box > button.combo, filechooser .path-bar.linked > button:only-child { border-radius: 
3px; border-style: solid; }
+.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
> button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > 
combobox:only-child > box > button.combo { border-radius: 3px; border-style: solid; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, 
.linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, 
.linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid 
solid none solid; border-radius: 0; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index f48f6e0ee1..d99d1b1691 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -432,13 +432,13 @@ button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {
 
 .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > 
button:backdrop:disabled:checked label { color: #c3c3c0; }
 
-toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, 
.linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, 
.inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 
button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > 
button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; 
border-right-style: none; }
+toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, 
.linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, 
.inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 
button:checked, .linked > button:backdrop, .linked > combobox > box > button.combo:dir(ltr), .linked > 
combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:dir(ltr):first-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):first-child, .inline-toolbar button:dir(ltr):first-child, .linked > 
button:dir(ltr):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), 
toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat:dir(ltr), combobox.linked 
button:dir(ltr):nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(ltr), filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > 
spinbutton:dir(rtl):last-child:not(.vertical), .linked:not(.vertical) > entry:dir(rtl):last-child, 
.inline-toolbar button:dir(rtl):last-child, .linked > button:dir(rtl):last-child, toolbar.inline-toolbar 
toolbutton:last-child > button.flat:dir(rtl), toolbar.inline-toolbar toolbutton:backdrop:last-child > 
button.flat:dir(rtl), .linked:not(.vertical) > combobox:last-child > box > button.combo:dir(rtl), filechoos
 er .path
 -bar.linked > button:dir(rtl):last-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; 
border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }
+.linked:not(.vertical) > spinbutton:dir(ltr):first-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):first-child, .inline-toolbar button:dir(ltr):first-child, .linked > 
button:dir(ltr):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), 
toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat:dir(ltr), combobox.linked 
button:dir(ltr):nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):last-child:not(.vertical), 
.linked:not(.vertical) > entry:dir(rtl):last-child, .inline-toolbar button:dir(rtl):last-child, .linked > 
button:dir(rtl):last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(rtl), 
toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(rtl), .linked:not(.vertical) > 
combobox:last-child > box > button.combo:dir(rtl) { border-top-left-radius: 3px; border-bottom-left-radius: 
3px; border-
 top-righ
 t-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:dir(ltr):last-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):last-child, .inline-toolbar button:dir(ltr):last-child, .linked > button:dir(ltr):last-child, 
toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(ltr), toolbar.inline-toolbar 
toolbutton:backdrop:last-child > button.flat:dir(ltr), combobox.linked button:dir(ltr):nth-child(2), 
.linked:not(.vertical) > combobox:last-child > box > button.combo:dir(ltr), filechooser .path-bar.linked > 
button:dir(ltr):last-child, .linked:not(.vertical) > spinbutton:dir(rtl):first-child:not(.vertical), 
.linked:not(.vertical) > entry:dir(rtl):first-child, .inline-toolbar button:dir(rtl):first-child, .linked > 
button:dir(rtl):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(rtl), 
toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat:dir(rtl), combobox.linked 
button:dir(rtl):nth-child(2), .linked:not(.vertical) > combobox:first-child > bo
 x > butt
 on.combo:dir(rtl), filechooser .path-bar.linked > button:dir(rtl):first-child { border-top-left-radius: 0; 
border-bottom-left-radius: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; 
border-right-style: solid; }
+.linked:not(.vertical) > spinbutton:dir(ltr):last-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):last-child, .inline-toolbar button:dir(ltr):last-child, .linked > button:dir(ltr):last-child, 
toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(ltr), toolbar.inline-toolbar 
toolbutton:backdrop:last-child > button.flat:dir(ltr), combobox.linked button:dir(ltr):nth-child(2), 
.linked:not(.vertical) > combobox:last-child > box > button.combo:dir(ltr), .linked:not(.vertical) > 
spinbutton:dir(rtl):first-child:not(.vertical), .linked:not(.vertical) > entry:dir(rtl):first-child, 
.inline-toolbar button:dir(rtl):first-child, .linked > button:dir(rtl):first-child, toolbar.inline-toolbar 
toolbutton:first-child > button.flat:dir(rtl), toolbar.inline-toolbar toolbutton:backdrop:first-child > 
button.flat:dir(rtl), combobox.linked button:dir(rtl):nth-child(2), .linked:not(.vertical) > 
combobox:first-child > box > button.combo:dir(rtl) { border-top-left-radius: 0; bord
 er-botto
 m-left-radius: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; }
 
-.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
> button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > 
combobox:only-child > box > button.combo, filechooser .path-bar.linked > button:only-child { border-radius: 
3px; border-style: solid; }
+.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
> button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > 
combobox:only-child > box > button.combo { border-radius: 3px; border-style: solid; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, 
.linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, 
.linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid 
solid none solid; border-radius: 0; }
 
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 611ed152a8..5b7cab92f1 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1303,13 +1303,6 @@ headerbar {
  * Pathbars *
  ************/
 
-// GtkPathBar does not work with just .linked, so we must override that. But we
-// can’t simply remove .linked from the widget as that might break other themes.
-// Note also we select on filechooser to avoid interfering with NautilusPathBar.
-filechooser .path-bar.linked > button {
-  @extend %linked;
-}
-
 .path-bar button {
   padding: 5px 6px 6px;
   &:first-child { padding-left: 8px; }
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css 
b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 098a126db5..1ac9d8db13 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -340,13 +340,13 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch
 
 .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > 
button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: 
#494949; background-image: none; background-color: #090909; }
 
-toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, 
toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar.inline-toolbar toolbutton:backdrop > 
button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, 
.inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > 
button:active, .linked > button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, 
.linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { 
border-radius: 0; border-right-style: none; }
+toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, 
toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar.inline-toolbar toolbutton:backdrop > 
button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, 
.inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > 
button:active, .linked > button:checked, .linked > button:backdrop, .linked > combobox > box > 
button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; 
border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:dir(ltr):first-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):first-child, .inline-toolbar button:dir(ltr):first-child, .linked > 
button:dir(ltr):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), 
searchbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), toolbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(ltr), searchbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(ltr), combobox.linked 
button:dir(ltr):nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(ltr), filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > 
spinbutton:dir(rtl):last-child:not(.vertical), .linked:not(.vertical) > entry:dir(rtl):last-child, 
.inline-toolbar button:dir(rtl):last-child, .linked > button:dir(rtl):last-child, toolbar.inline-toolbar 
toolbutton:last-child > button.flat:dir(rtl), searchbar.
 inline-t
 oolbar toolbutton:last-child > button.flat:dir(rtl), toolbar.inline-toolbar toolbutton:backdrop:last-child > 
button.flat:dir(rtl), searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(rtl), 
.linked:not(.vertical) > combobox:last-child > box > button.combo:dir(rtl), filechooser .path-bar.linked > 
button:dir(rtl):last-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; 
border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }
+.linked:not(.vertical) > spinbutton:dir(ltr):first-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):first-child, .inline-toolbar button:dir(ltr):first-child, .linked > 
button:dir(ltr):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), 
searchbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), toolbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(ltr), searchbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(ltr), combobox.linked 
button:dir(ltr):nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):last-child:not(.vertical), 
.linked:not(.vertical) > entry:dir(rtl):last-child, .inline-toolbar button:dir(rtl):last-child, .linked > 
button:dir(rtl):last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(rtl), 
searchbar.inline-toolbar toolbutton:last-child > button.flat:dir(rtl),
  toolbar
 .inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(rtl), searchbar.inline-toolbar 
toolbutton:backdrop:last-child > button.flat:dir(rtl), .linked:not(.vertical) > combobox:last-child > box > 
button.combo:dir(rtl) { border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-top-right-radius: 
0; border-bottom-right-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:dir(ltr):last-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):last-child, .inline-toolbar button:dir(ltr):last-child, .linked > button:dir(ltr):last-child, 
toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(ltr), searchbar.inline-toolbar 
toolbutton:last-child > button.flat:dir(ltr), toolbar.inline-toolbar toolbutton:backdrop:last-child > 
button.flat:dir(ltr), searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(ltr), 
combobox.linked button:dir(ltr):nth-child(2), .linked:not(.vertical) > combobox:last-child > box > 
button.combo:dir(ltr), filechooser .path-bar.linked > button:dir(ltr):last-child, .linked:not(.vertical) > 
spinbutton:dir(rtl):first-child:not(.vertical), .linked:not(.vertical) > entry:dir(rtl):first-child, 
.inline-toolbar button:dir(rtl):first-child, .linked > button:dir(rtl):first-child, toolbar.inline-toolbar 
toolbutton:first-child > button.flat:dir(rtl), searchbar.inline-toolbar
  toolbut
 ton:first-child > button.flat:dir(rtl), toolbar.inline-toolbar toolbutton:backdrop:first-child > 
button.flat:dir(rtl), searchbar.inline-toolbar toolbutton:backdrop:first-child > button.flat:dir(rtl), 
combobox.linked button:dir(rtl):nth-child(2), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(rtl), filechooser .path-bar.linked > button:dir(rtl):first-child { border-top-left-radius: 
0; border-bottom-left-radius: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; 
border-right-style: solid; }
+.linked:not(.vertical) > spinbutton:dir(ltr):last-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):last-child, .inline-toolbar button:dir(ltr):last-child, .linked > button:dir(ltr):last-child, 
toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(ltr), searchbar.inline-toolbar 
toolbutton:last-child > button.flat:dir(ltr), toolbar.inline-toolbar toolbutton:backdrop:last-child > 
button.flat:dir(ltr), searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(ltr), 
combobox.linked button:dir(ltr):nth-child(2), .linked:not(.vertical) > combobox:last-child > box > 
button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):first-child:not(.vertical), 
.linked:not(.vertical) > entry:dir(rtl):first-child, .inline-toolbar button:dir(rtl):first-child, .linked > 
button:dir(rtl):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(rtl), 
searchbar.inline-toolbar toolbutton:first-child > button.flat:dir(rtl), toolbar.inl
 ine-tool
 bar toolbutton:backdrop:first-child > button.flat:dir(rtl), searchbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(rtl), combobox.linked button:dir(rtl):nth-child(2), 
.linked:not(.vertical) > combobox:first-child > box > button.combo:dir(rtl) { border-top-left-radius: 0; 
border-bottom-left-radius: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; 
border-right-style: solid; }
 
-.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
> button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:only-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop:only-child > 
button.flat, .linked:not(.vertical) > combobox:only-child > box > button.combo, filechooser .path-bar.linked 
> button:only-child { border-radius: 3px; border-style: solid; }
+.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
> button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:only-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop:only-child > 
button.flat, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 3px; 
border-style: solid; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, 
.linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, 
.linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid 
solid none solid; border-radius: 0; }
 
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index a9e519a9ec..1e6e2e6b40 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -342,13 +342,13 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch
 
 .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > 
button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: silver; 
background-image: none; background-color: #f6f6f6; }
 
-toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, 
toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar.inline-toolbar toolbutton:backdrop > 
button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, 
.inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > 
button:active, .linked > button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, 
.linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { 
border-radius: 0; border-right-style: none; }
+toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, 
toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar.inline-toolbar toolbutton:backdrop > 
button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, 
.inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > 
button:active, .linked > button:checked, .linked > button:backdrop, .linked > combobox > box > 
button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; 
border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:dir(ltr):first-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):first-child, .inline-toolbar button:dir(ltr):first-child, .linked > 
button:dir(ltr):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), 
searchbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), toolbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(ltr), searchbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(ltr), combobox.linked 
button:dir(ltr):nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(ltr), filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > 
spinbutton:dir(rtl):last-child:not(.vertical), .linked:not(.vertical) > entry:dir(rtl):last-child, 
.inline-toolbar button:dir(rtl):last-child, .linked > button:dir(rtl):last-child, toolbar.inline-toolbar 
toolbutton:last-child > button.flat:dir(rtl), searchbar.
 inline-t
 oolbar toolbutton:last-child > button.flat:dir(rtl), toolbar.inline-toolbar toolbutton:backdrop:last-child > 
button.flat:dir(rtl), searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(rtl), 
.linked:not(.vertical) > combobox:last-child > box > button.combo:dir(rtl), filechooser .path-bar.linked > 
button:dir(rtl):last-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; 
border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }
+.linked:not(.vertical) > spinbutton:dir(ltr):first-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):first-child, .inline-toolbar button:dir(ltr):first-child, .linked > 
button:dir(ltr):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), 
searchbar.inline-toolbar toolbutton:first-child > button.flat:dir(ltr), toolbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(ltr), searchbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(ltr), combobox.linked 
button:dir(ltr):nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):last-child:not(.vertical), 
.linked:not(.vertical) > entry:dir(rtl):last-child, .inline-toolbar button:dir(rtl):last-child, .linked > 
button:dir(rtl):last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(rtl), 
searchbar.inline-toolbar toolbutton:last-child > button.flat:dir(rtl),
  toolbar
 .inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(rtl), searchbar.inline-toolbar 
toolbutton:backdrop:last-child > button.flat:dir(rtl), .linked:not(.vertical) > combobox:last-child > box > 
button.combo:dir(rtl) { border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-top-right-radius: 
0; border-bottom-right-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:dir(ltr):last-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):last-child, .inline-toolbar button:dir(ltr):last-child, .linked > button:dir(ltr):last-child, 
toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(ltr), searchbar.inline-toolbar 
toolbutton:last-child > button.flat:dir(ltr), toolbar.inline-toolbar toolbutton:backdrop:last-child > 
button.flat:dir(ltr), searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(ltr), 
combobox.linked button:dir(ltr):nth-child(2), .linked:not(.vertical) > combobox:last-child > box > 
button.combo:dir(ltr), filechooser .path-bar.linked > button:dir(ltr):last-child, .linked:not(.vertical) > 
spinbutton:dir(rtl):first-child:not(.vertical), .linked:not(.vertical) > entry:dir(rtl):first-child, 
.inline-toolbar button:dir(rtl):first-child, .linked > button:dir(rtl):first-child, toolbar.inline-toolbar 
toolbutton:first-child > button.flat:dir(rtl), searchbar.inline-toolbar
  toolbut
 ton:first-child > button.flat:dir(rtl), toolbar.inline-toolbar toolbutton:backdrop:first-child > 
button.flat:dir(rtl), searchbar.inline-toolbar toolbutton:backdrop:first-child > button.flat:dir(rtl), 
combobox.linked button:dir(rtl):nth-child(2), .linked:not(.vertical) > combobox:first-child > box > 
button.combo:dir(rtl), filechooser .path-bar.linked > button:dir(rtl):first-child { border-top-left-radius: 
0; border-bottom-left-radius: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; 
border-right-style: solid; }
+.linked:not(.vertical) > spinbutton:dir(ltr):last-child:not(.vertical), .linked:not(.vertical) > 
entry:dir(ltr):last-child, .inline-toolbar button:dir(ltr):last-child, .linked > button:dir(ltr):last-child, 
toolbar.inline-toolbar toolbutton:last-child > button.flat:dir(ltr), searchbar.inline-toolbar 
toolbutton:last-child > button.flat:dir(ltr), toolbar.inline-toolbar toolbutton:backdrop:last-child > 
button.flat:dir(ltr), searchbar.inline-toolbar toolbutton:backdrop:last-child > button.flat:dir(ltr), 
combobox.linked button:dir(ltr):nth-child(2), .linked:not(.vertical) > combobox:last-child > box > 
button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):first-child:not(.vertical), 
.linked:not(.vertical) > entry:dir(rtl):first-child, .inline-toolbar button:dir(rtl):first-child, .linked > 
button:dir(rtl):first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat:dir(rtl), 
searchbar.inline-toolbar toolbutton:first-child > button.flat:dir(rtl), toolbar.inl
 ine-tool
 bar toolbutton:backdrop:first-child > button.flat:dir(rtl), searchbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat:dir(rtl), combobox.linked button:dir(rtl):nth-child(2), 
.linked:not(.vertical) > combobox:first-child > box > button.combo:dir(rtl) { border-top-left-radius: 0; 
border-bottom-left-radius: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; 
border-right-style: solid; }
 
-.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
> button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:only-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop:only-child > 
button.flat, .linked:not(.vertical) > combobox:only-child > box > button.combo, filechooser .path-bar.linked 
> button:only-child { border-radius: 3px; border-style: solid; }
+.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
> button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:only-child > button.flat, searchbar.inline-toolbar toolbutton:backdrop:only-child > 
button.flat, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 3px; 
border-style: solid; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, 
.linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, 
.linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid 
solid none solid; border-radius: 0; }