GTK3-3.20 traditional themes: button state cleanup + fix size of nemos buttons

2 files changed, 57 insertions, 101 deletions

diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 7b6b8300..e6d239ce 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -842,22 +842,19 @@ button {
 
 button,
 button.menuitem.menubar,
-button.combo,
 toolbar.inline-toolbar button,
-toolbar.primary-toolbar.horizontal button,
-toolbar.primary-toolbar.horizontal button:active,
-toolbar.horizontal button,
-toolbar.horizontal button:active,
 .titlebar .linked.raised button,
-.titlebar .linked.raised button:active {
+.titlebar .linked.raised button:checked {
     padding: 5px 5px 6px; /* larger values makes the button arrow smaller*/
 }
 
 toolbar.horizontal button,
-toolbar.horizontal button:active,
+toolbar.horizontal button:checked,
 toolbar.primary-toolbar.horizontal button,
-toolbar.primary-toolbar.horizontal button:active {
-    padding: 2px 2px;
+toolbar.primary-toolbar.horizontal button:checked {
+    padding: 4px 3px;
+    min-height: 16px;
+    min-width: 26px;
 }
 
 button.default {
@@ -992,6 +989,10 @@ button .separator {
     padding: 4px 2px;
 }
 
+.linked entry {
+    padding: 4px;
+}
+
 /* Leftmost button */
 .linked entry:first-child,
 .linked button:first-child,
@@ -1007,11 +1008,11 @@ button .separator {
     border-radius: 3px 0 0 3px;
     border-color: @border_color;
     border-width: 1px 0px 1px 1px;
-    padding: 4px 2px;
+    padding: 4px 3px;
 }
 
 .linked entry:first-child {
-    padding: 6px;
+    padding: 4px;
     border-width: 1px;
 }
 
@@ -1030,11 +1031,11 @@ button .separator {
     border-radius: 0 3px 3px 0;
     border-color: @border_color;
     border-width: 1px 1px 1px 0px;
-    padding: 4px 2px;
+    padding: 4px 3px;
 }
 
 .linked entry:last-child {
-    padding: 6px;
+    padding: 4px;
 }
 
 /* vertical */
@@ -1648,6 +1649,7 @@ combobox arrow {
 combobox entry.combo,
 combobox button.combo {
     color: @internal_element_color;
+    padding: 4px
 }
 
 combobox entry.combo:disabled,
@@ -2264,7 +2266,7 @@ toolbar {
 }
 
 toolbar button {
-    padding: 1px;
+    padding: 2px 5px;
 }
 
 toolbar:disabled {
@@ -2444,7 +2446,6 @@ GtkOverlay.osd {
 }
 
 .osd button,
-.osd button:active,
 .osd button:checked {
     border-width: 1px;
     border-style: solid;
@@ -2460,7 +2461,6 @@ GtkOverlay.osd {
 }
 
 .osd button:hover,
-.osd button:active,
 .osd button:checked {
     border-color: shade (@theme_selected_bg_color, 0.5);
 }
@@ -2481,21 +2481,18 @@ GtkOverlay.osd {
 }
 
 .osd.button,
-.osd.button:active,
 .osd.button:checked {
     border-color: transparent;
 }
 
 .osd.button,
 .osd.button:hover,
-.osd.button:active,
 .osd.button:checked {
     background-color: shade(@osd_bg, 1.10);
 }
 
 .osd button,
 .osd button:hover,
-.osd button:active,
 .osd button:checked {
     background-color: transparent;
 }
@@ -2506,8 +2503,6 @@ GtkOverlay.osd {
     background-color: @osd_button_bg_insensitive;
 }
 
-.osd.button:active:disabled,
-.osd button:active:disabled,
 .osd.button:checked:disabled,
 .osd button:checked:disabled {
     background-image: none;
@@ -2519,23 +2514,19 @@ GtkOverlay.osd {
     color: @osd_button_fg_hover;
 }
 
-.osd.button:active,
 .osd.button:hover:active,
-.osd button:active,
 .osd button:hover:active,
 .osd.button:checked,
-.osd.button:hover:checked,
+.osd.button:checked:hover,
 .osd button:checked,
-.osd button:hover:checked {
+.osd button:checked:hover {
     color: @osd_button_fg_active;
 }
 
 .osd.button:disabled,
-.osd.button:active *:disabled,
-.osd.button:checked *:disabled,
+.osd.button:checked:disabled,
 .osd button:disabled,
-.osd button:active *:disabled,
-.osd button:checked *:disabled {
+.osd button:checked:disabled {
     color: @osd_button_fg_insensitive;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2549,11 +2540,6 @@ GtkOverlay.osd {
                                       @osd_button_bg_hover_c);
 }
 
-.osd.button:active,
-.osd.button:active:hover,
-.osd button:active,
-.osd button:active:hover,
-.osd GtkMenuButton.menu-button:active,
 .osd.button:checked,
 .osd.button:checked:hover,
 .osd button:checked,
@@ -2565,25 +2551,21 @@ GtkOverlay.osd {
                                       @osd_button_bg_active_c);
 }
 
-.osd .linked button:active:first-child {
+.osd .linked button:checked:first-child {
     border-left-width: 1px;
 }
 
-.osd .linked button:active:last-child {
+.osd .linked button:checked:last-child {
     border-right-width: 1px;
 }
 
-.osd GtkMenuButton.menu-button:active {
+.osd GtkMenuButton.menu-button:checked {
     background-color: transparent;
     border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-button:active {
     color: @osd_button_fg_active;
     text-shadow: 0 -1px @osd_button_shadow;
 }
 
-
 toolbar.osd {
     color: @osd_fg;
     text-shadow: 0 1px @osd_text_shadow;
@@ -2609,18 +2591,16 @@ toolbar.osd button:hover,
 toolbar.osd button:focus,
 toolbar.osd button:focus.hover,
 toolbar.osd button:focus.hover:active,
-toolbar.osd button:active,
 toolbar.osd button:checked,
-toolbar.osd button:active:hover,
+toolbar.osd button:hover:active,
 toolbar.osd button:disabled,
 toolbar.osd .linked button,
 toolbar.osd .linked button:hover,
 toolbar.osd .linked button:focus,
 toolbar.osd .linked button:focus:hover,
 toolbar.osd .linked button:focus:hover:active,
-toolbar.osd .linked button:active,
 toolbar.osd .linked button:checked,
-toolbar.osd .linked button:active:hover,
+toolbar.osd .linked button:hover:active,
 toolbar.osd .linked button:disabled {
     border-color: shade (@theme_bg_color, 0.4);
     border-style: solid;
@@ -2629,8 +2609,8 @@ toolbar.osd .linked button:disabled {
     border-radius: 0px;
 }
 
-toolbar.osd button:active,
-toolbar.osd button:active:hover {
+toolbar.osd button:checked,
+toolbar.osd button:checked:hover {
     background-image: linear-gradient(to bottom,
                                       @osd_button_bg_active_a,
                                       @osd_button_bg_active_b 20%,
@@ -2971,27 +2951,25 @@ treeview header button:disabled {
 
 treeview header button:hover,
 treeview header button:focus:hover,
-treeview header button:active:focus:hover,
-treeview header button:active:focus,
-treeview header button:active:hover,
+treeview header button:focus:hover:active,
+treeview header button:hover:active,
 treeview header button:checked,
-treeview header button:active:hover {
+treeview header button:checked:hover {
     color: @internal_element_hover_color;
 }
 
 treeview header button:checked,
-treeview header button:active:hover,
-treeview header button:active:hover:focus,
-treeview header button:active:focus {
+treeview header button:checked:hover,
+treeview header button:checked:hover:focus {
     background-color: @entry_bg_color;
     background-image: none;
 }
 
 treeview header button,
 treeview header button:focus,
-treeview header button:active,
-treeview header button:active:hover,
-treeview header button:active:focus {
+treeview header button:checked,
+treeview header button:checked:hover,
+treeview header button:focus:checked {
     border-image: none;
     border-width: 1px;
     border-radius: 0;
@@ -3003,9 +2981,9 @@ treeview header button:active:focus {
 
 treeview header button:last-child,
 treeview header button:last-child:focus,
-treeview header button:last-child:active,
-treeview header button:last-child:active:hover,
-treeview header button:last-child:active:focus{
+treeview header button:last-child:checked,
+treeview header button:last-child:hover:active,
+treeview header button:last-child:active:focus {
     border-right: none;
 }
 
@@ -3176,37 +3154,37 @@ infobar entry,
 infobar entry:focus,
 infobar button,
 infobar button:disabled,
-infobar button:active,
+infobar button:checked,
 infobar button:focus,
-infobar button:active:focus,
+infobar button:focus:checked,
 entry.info,
 entry.info:focus,
 .info button,
 .info button:disabled,
-.info button:active,
+.info button:checked,
 .info button:focus,
-.info button:active:focus,
+.info button:focus:checked,
 entry.warning,
 entry.warning:focus,
 .warning button,
 .warning button:disabled,
-.warning button:active,
+.warning button:checked,
 .warning button:focus,
-.warning button:active:focus,
+.warning button:focus:checked,
 entry.question,
 entry.question:focus,
 .question button,
 .question button:disabled,
-.question button:active,
+.question button:checked,
 .question button:focus,
-.question button:active:focus,
+.question button:focus:checked,
 entry.error,
 entry.error:focus,
 .error button,
 .error button:disabled,
-.error button:active,
+.error button:checked,
 .error button:focus,
-.error button:active:focus {
+.error button:focus:checked {
     border-image: none;
     border-color: shade(@border_color, 0.9);
     border-style: solid;
@@ -3663,13 +3641,9 @@ calendar.header .app-notification.frame button.titlebutton {
     border-radius: 3px;
 }
 
-.app-notification button:active,
 .app-notification button:checked,
-.app-notification button:backdrop:active,
 .app-notification button:backdrop:checked,
-.app-notification.frame button:active,
 .app-notification.frame button:checked,
-.app-notification.frame button:backdrop:active,
 .app-notification.frame button:backdrop:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -3722,8 +3696,8 @@ calendar.header .app-notification.frame button.titlebutton {
 
 button.flat.link.text-button,
 button.flat.link.text-button:hover,
-button.flat.link.text-button:active,
-button.flat.link.text-button:active:hover {
+button.flat.link.text-button:checked,
+button.flat.link.text-button:hover:active {
     text-shadow: none;
 }
 
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
index 7d650610..500f98fe 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
@@ -7,35 +7,17 @@ GtkPaned.horizontal .vertical GtkOverlay GtkRevealer.bottom .background.horizont
     color: @theme_fg_color;
 }
 
-/* buttons control panel */
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:hover ,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover {
-    border-style: none;
-    border-radius: 4px;
-    background-color: transparent;
-    background-image: none;
-    box-shadow: none;
-    padding: 4px 7px;
-    color: @theme_fg_color;
-}
-
 /* rhythmbox */
 
 .primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:active,
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:checked,
 .primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
     padding: 0px 6px;
 }
 
+/* nemo */
+
+/* icon and list view */
+.nemo-window-pane scrolledwindow {
+    background-color: @theme_base_color;
+}