GTK+-3.20 TOK themes: adjust linked buttons for rhythmbox and nemo

6 files changed, 172 insertions, 4 deletions

diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css
index 0016d914..0e503098 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css
@@ -394,7 +394,17 @@ button.flat:hover,
 toolbar.primary-toolbar button:checked,
 .titlebar button.titlebutton:hover,
 toolbar.primary-toolbar button.raised,
-toolbar.primary-toolbar .raised button,
+toolbar.primary-toolbar .linked button.raised,
+toolbar.primary-toolbar .linked button.raised:hover,
+toolbar.primary-toolbar .linked button.raised:focus,
+toolbar.primary-toolbar .linked button.raised:focus:hover,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:hover,
+toolbar.primary-toolbar .raised.linked button:focus,
+toolbar.primary-toolbar .raised.linked button:focus:hover,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active,
+toolbar.primary-toolbar .raised.raised button:disabled,
 toolbar.primary-toolbar combobox button,
 /* primary toolbar - generic element borders */
 toolbar.primary-toolbar entry,
@@ -550,6 +560,63 @@ toolbar.inline-toolbar toolbutton button :only-child:disabled {
     border-color: transparent;
 }
 
+/* Middle button */
+toolbar.primary-toolbar .linked button.raised,
+toolbar.primary-toolbar .linked button.raised:hover,
+toolbar.primary-toolbar .linked button.raised:focus,
+toolbar.primary-toolbar .linked button.raised:focus:hover,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:hover,
+toolbar.primary-toolbar .raised.linked button:focus,
+toolbar.primary-toolbar .raised.linked button:focus:hover,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active,
+toolbar.primary-toolbar .raised.linked button:disabled {
+    border-image-width: 3px 0px 4px 0px;
+    border-radius: 0;
+    border-width: 1px 0px 1px 0px;
+    border-color: @border_color;
+    padding: 4px 3px;
+}
+
+/* Leftmost button */
+toolbar.primary-toolbar .linked button.raised:first-child,
+toolbar.primary-toolbar .linked button.raised:hover:first-child,
+toolbar.primary-toolbar .linked button.raised:focus:first-child,
+toolbar.primary-toolbar .linked button.raised:focus:hover:first-child,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active:first-child,
+toolbar.primary-toolbar .raised.linked button:first-child,
+toolbar.primary-toolbar .raised.linked button:hover:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:hover:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active:first-child,
+toolbar.primary-toolbar .raised.linked button:disabled:first-child {
+    border-image-width: 3px 0px 4px 3px;
+    border-radius: 3px 0 0 3px;
+    border-width: 1px 0px 1px 1px;
+    border-color: @border_color;
+    padding: 4px 3px;
+}
+
+/* Rightmost button */
+toolbar.primary-toolbar .linked button.raised:last-child,
+toolbar.primary-toolbar .linked button.raised:hover:last-child,
+toolbar.primary-toolbar .linked button.raised:focus:last-child,
+toolbar.primary-toolbar .linked button.raised:focus:hover:last-child,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active:last-child,
+toolbar.primary-toolbar .raised.linked button:last-child,
+toolbar.primary-toolbar .raised.linked button:hover:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:hover:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active:last-child,
+toolbar.primary-toolbar .raised.linked button:disabled:last-child {
+    border-image-width: 3px 3px 4px 0px;
+    border-radius: 0 3px 3px 0;
+    border-width: 1px 1px 1px 0px;
+    border-color: @border_color;
+    padding: 4px 3px;
+}
+
 /* generic disabled element borders */
 switch:disabled,
 combobox entry:disabled,
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index dd2930cc..67a4b16d 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -1594,7 +1594,6 @@ notebook button.flat.small-button {
     border-width: 1px;
     background-image: none;
     background-color: transparent;
-    color: mix(@theme_fg_color, @theme_base_color, 0.6);
     padding: 0;
 }
 
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/other-applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/other-applications.css
index 6335f39a..a28dcef4 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/other-applications.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/other-applications.css
@@ -24,3 +24,21 @@
     background-color: @theme_base_color;
 }
 
+/* workaround for broken first/last-child logic with linked buttons
+   in pathbar since gtk+-3.18 */
+
+.nemo-window widget.raised.linked > button,
+.nemo-window widget.raised.linked > button:first-child,
+.nemo-window widget.raised.linked > button:last-child,
+.nemo-window widget.raised.linked > button:hover,
+.nemo-window widget.raised.linked > button:hover:first-child,
+.nemo-window widget.raised.linked > button:hover:last-child {
+    border-radius: 3px;
+    border-width: 1px;
+    border-style: solid;
+    padding: 3px;
+    border-image: none;
+    border-color: @border_color;
+    margin: 0px 1px;
+}
+
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
index 0016d914..0e503098 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
@@ -394,7 +394,17 @@ button.flat:hover,
 toolbar.primary-toolbar button:checked,
 .titlebar button.titlebutton:hover,
 toolbar.primary-toolbar button.raised,
-toolbar.primary-toolbar .raised button,
+toolbar.primary-toolbar .linked button.raised,
+toolbar.primary-toolbar .linked button.raised:hover,
+toolbar.primary-toolbar .linked button.raised:focus,
+toolbar.primary-toolbar .linked button.raised:focus:hover,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:hover,
+toolbar.primary-toolbar .raised.linked button:focus,
+toolbar.primary-toolbar .raised.linked button:focus:hover,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active,
+toolbar.primary-toolbar .raised.raised button:disabled,
 toolbar.primary-toolbar combobox button,
 /* primary toolbar - generic element borders */
 toolbar.primary-toolbar entry,
@@ -550,6 +560,63 @@ toolbar.inline-toolbar toolbutton button :only-child:disabled {
     border-color: transparent;
 }
 
+/* Middle button */
+toolbar.primary-toolbar .linked button.raised,
+toolbar.primary-toolbar .linked button.raised:hover,
+toolbar.primary-toolbar .linked button.raised:focus,
+toolbar.primary-toolbar .linked button.raised:focus:hover,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:hover,
+toolbar.primary-toolbar .raised.linked button:focus,
+toolbar.primary-toolbar .raised.linked button:focus:hover,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active,
+toolbar.primary-toolbar .raised.linked button:disabled {
+    border-image-width: 3px 0px 4px 0px;
+    border-radius: 0;
+    border-width: 1px 0px 1px 0px;
+    border-color: @border_color;
+    padding: 4px 3px;
+}
+
+/* Leftmost button */
+toolbar.primary-toolbar .linked button.raised:first-child,
+toolbar.primary-toolbar .linked button.raised:hover:first-child,
+toolbar.primary-toolbar .linked button.raised:focus:first-child,
+toolbar.primary-toolbar .linked button.raised:focus:hover:first-child,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active:first-child,
+toolbar.primary-toolbar .raised.linked button:first-child,
+toolbar.primary-toolbar .raised.linked button:hover:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:hover:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active:first-child,
+toolbar.primary-toolbar .raised.linked button:disabled:first-child {
+    border-image-width: 3px 0px 4px 3px;
+    border-radius: 3px 0 0 3px;
+    border-width: 1px 0px 1px 1px;
+    border-color: @border_color;
+    padding: 4px 3px;
+}
+
+/* Rightmost button */
+toolbar.primary-toolbar .linked button.raised:last-child,
+toolbar.primary-toolbar .linked button.raised:hover:last-child,
+toolbar.primary-toolbar .linked button.raised:focus:last-child,
+toolbar.primary-toolbar .linked button.raised:focus:hover:last-child,
+toolbar.primary-toolbar .linked button.raised:focus:hover:active:last-child,
+toolbar.primary-toolbar .raised.linked button:last-child,
+toolbar.primary-toolbar .raised.linked button:hover:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:hover:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:hover:active:last-child,
+toolbar.primary-toolbar .raised.linked button:disabled:last-child {
+    border-image-width: 3px 3px 4px 0px;
+    border-radius: 0 3px 3px 0;
+    border-width: 1px 1px 1px 0px;
+    border-color: @border_color;
+    padding: 4px 3px;
+}
+
 /* generic disabled element borders */
 switch:disabled,
 combobox entry:disabled,
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 7a428de8..f0451b67 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -1594,7 +1594,6 @@ notebook button.flat.small-button {
     border-width: 1px;
     background-image: none;
     background-color: transparent;
-    color: mix(@theme_fg_color, @theme_base_color, 0.6);
     padding: 0;
 }
 
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
index 9ba43f62..6d9f0283 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
@@ -23,3 +23,21 @@
 .nemo-window-pane scrolledwindow {
     background-color: @theme_base_color;
 }
+
+/* workaround for broken first/last-child logic with linked buttons
+   in pathbar since gtk+-3.18 */
+
+.nemo-window widget.raised.linked > button,
+.nemo-window widget.raised.linked > button:first-child,
+.nemo-window widget.raised.linked > button:last-child,
+.nemo-window widget.raised.linked > button:hover,
+.nemo-window widget.raised.linked > button:hover:first-child,
+.nemo-window widget.raised.linked > button:hover:last-child {
+    border-radius: 3px;
+    border-width: 1px;
+    border-style: solid;
+    padding: 3px;
+    border-image: none;
+    border-color: @border_color;
+    margin: 0px 1px;
+}