From 42dd9d04542dc2eb97fb894f8413b6a072d2eecf Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 21 Oct 2015 16:01:30 +0200 Subject: Gtk+-3.18 submarine themes: clean up of button states in gtk-widget-assets.css --- .../Blue-Submarine/gtk-3.0/gtk-widgets-assets.css | 111 ++++----------------- .../Green-Submarine/gtk-3.0/gtk-widgets-assets.css | 71 +------------ 2 files changed, 24 insertions(+), 158 deletions(-) diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css index f9af1f0c..ecd32cfe 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css @@ -16,9 +16,7 @@ background-color: transparent; } -.check:active, .check:checked, -.view.cell.check:active, .view.cell.check:checked, .check row:selected:checked, .check row:selected:focus:checked { @@ -26,11 +24,8 @@ } -.check:active:insensitive, .check:checked:insensitive, -.check row:selected:active:insensitive, .check row:selected:checked:insensitive, -.check row:selected:focus:active:insensitive, .check row:selected:focus:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png")); background-color: transparent; @@ -63,22 +58,15 @@ -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-insensitive.png")); } -.radio:active, .radio:checked, -.view.cell.radio:active, .view.cell.radio:checked, -.radio row:selected:active, .radio row:selected:checked, -.radio row:selected:focus:active, .radio row:selected:focus:checked { - -gtk-icon-source: -gtk-scaled(url("assets/radio-selected.png")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-selected.png")); } -.radio:active:insensitive, .radio:checked:insensitive, -.radio row:selected:active:insensitive, .radio row:selected:checked:insensitive, -.radio row:selected:focus:active:insensitive, .radio row:selected:focus:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive.png")); } @@ -97,9 +85,6 @@ background-color: transparent; } -.sidebar .view.radio:active, -.sidebar .view.radio:active:focus, -.sidebar .view.radio:active:hover, .sidebar .view.radio:checked, .sidebar .view.radio:checked:focus, .sidebar .view.radio:checked:hover { @@ -110,10 +95,8 @@ -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg")); } -.sidebar .view.radio:active:selected, -.sidebar .view.radio:active:selected:focus, -.sidebar .view.radio:checked:selected, -.sidebar .view.radio:checked:selected:focus { +.sidebar .view.radio:selected:checked, +.sidebar .view.radio:selected:checked:focus { -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg")); } @@ -129,115 +112,66 @@ .menuitem.radio:insensitive, .menuitem.check:hover, .menuitem.check:insensitive { - background-color: transparent; - background: none; - border-style: none; - border-image: none; + background-color: transparent; + background: none; + border-style: none; + border-image: none; } .menuitem.radio { - -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-unselected.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-unselected.svg")); } .menuitem.radio:checked { - -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked.svg")); } .menuitem.radio:checked:hover { - -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-prelight.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-prelight.svg")); } .menuitem.radio:checked:insensitive { - -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-insensitive.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-insensitive.svg")); } .menuitem.radio:inconsistent { - -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed.svg")); } .menuitem.radio:inconsistent:hover { - -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-prelight.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-prelight.svg")); } .menuitem.radio:inconsistent:insensitive { - -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-insensitive.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-insensitive.svg")); } .menuitem.check { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-unchecked.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-unchecked.svg")); } .menuitem.check:checked{ - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked.svg")); } .menuitem.check:checked:hover { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-prelight.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-prelight.svg")); } .menuitem.check:checked:insensitive { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-insensitive.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-insensitive.svg")); } .menuitem.check:inconsistent { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed.svg")); } .menuitem.check:inconsistent:hover { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-prelight.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-prelight.svg")); } .menuitem.check:inconsistent:insensitive { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-insensitive.svg")); -} - -.primary-toolbar GtkComboBox.combobox-entry .button, -GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(last), -GtkComboBox.combobox-entry .button:nth-child(last) { - -} - -.primary-toolbar GtkComboBox.combobox-entry .button:active, -.primary-toolbar GtkComboBox.combobox-entry .button:hover:active, -GtkComboBox.combobox-entry .button:active, -GtkComboBox.combobox-entry .button:hover:active, -.primary-toolbar GtkComboBox.combobox-entry .button:active:nth-child(last), -.primary-toolbar GtkComboBox.combobox-entry .button:hover:active:nth-child(last), -GtkComboBox.combobox-entry .button:active:nth-child(last), -GtkComboBox.combobox-entry .button:hover:active:nth-child(last) { - -} - -/* for RTL languages */ -.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(first), -GtkComboBox.combobox-entry .button:nth-child(first) { - -} - -.primary-toolbar GtkComboBox.combobox-entry .button:active:nth-child(first), -.primary-toolbar GtkComboBox.combobox-entry .button:hover:active:nth-child(first), -GtkComboBox.combobox-entry .button:active:nth-child(first), -GtkComboBox.combobox-entry .button:hover:active:nth-child(first) { - -} - -GtkScale.trough, -GtkScale.trough.horizontal { - -} - -GtkScale.trough.vertical { - -} - - -GtkScale.progressbar.horizontal { - -} - -GtkScale.progressbar.vertical { - + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-insensitive.svg")); } GtkScale.slider, @@ -293,6 +227,3 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive { background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg"); } - - - diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css index d4da4da4..ecd32cfe 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css @@ -16,9 +16,7 @@ background-color: transparent; } -.check:active, .check:checked, -.view.cell.check:active, .view.cell.check:checked, .check row:selected:checked, .check row:selected:focus:checked { @@ -26,11 +24,8 @@ } -.check:active:insensitive, .check:checked:insensitive, -.check row:selected:active:insensitive, .check row:selected:checked:insensitive, -.check row:selected:focus:active:insensitive, .check row:selected:focus:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png")); background-color: transparent; @@ -63,22 +58,15 @@ -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-insensitive.png")); } -.radio:active, .radio:checked, -.view.cell.radio:active, .view.cell.radio:checked, -.radio row:selected:active, .radio row:selected:checked, -.radio row:selected:focus:active, .radio row:selected:focus:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-selected.png")); } -.radio:active:insensitive, .radio:checked:insensitive, -.radio row:selected:active:insensitive, .radio row:selected:checked:insensitive, -.radio row:selected:focus:active:insensitive, .radio row:selected:focus:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive.png")); } @@ -97,9 +85,6 @@ background-color: transparent; } -.sidebar .view.radio:active, -.sidebar .view.radio:active:focus, -.sidebar .view.radio:active:hover, .sidebar .view.radio:checked, .sidebar .view.radio:checked:focus, .sidebar .view.radio:checked:hover { @@ -110,10 +95,8 @@ -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg")); } -.sidebar .view.radio:active:selected, -.sidebar .view.radio:active:selected:focus, -.sidebar .view.radio:checked:selected, -.sidebar .view.radio:checked:selected:focus { +.sidebar .view.radio:selected:checked, +.sidebar .view.radio:selected:checked:focus { -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg")); } @@ -122,6 +105,7 @@ -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected-prelight.svg")); } + /* Now draw menu check and radio items */ .menuitem.radio:hover, @@ -190,55 +174,6 @@ -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-insensitive.svg")); } -.primary-toolbar GtkComboBox.combobox-entry .button, -GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(last), -GtkComboBox.combobox-entry .button:nth-child(last) { - -} - -.primary-toolbar GtkComboBox.combobox-entry .button:active, -.primary-toolbar GtkComboBox.combobox-entry .button:hover:active, -GtkComboBox.combobox-entry .button:active, -GtkComboBox.combobox-entry .button:hover:active, -.primary-toolbar GtkComboBox.combobox-entry .button:active:nth-child(last), -.primary-toolbar GtkComboBox.combobox-entry .button:hover:active:nth-child(last), -GtkComboBox.combobox-entry .button:active:nth-child(last), -GtkComboBox.combobox-entry .button:hover:active:nth-child(last) { - -} - -/* for RTL languages */ -.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(first), -GtkComboBox.combobox-entry .button:nth-child(first) { - -} - -.primary-toolbar GtkComboBox.combobox-entry .button:active:nth-child(first), -.primary-toolbar GtkComboBox.combobox-entry .button:hover:active:nth-child(first), -GtkComboBox.combobox-entry .button:active:nth-child(first), -GtkComboBox.combobox-entry .button:hover:active:nth-child(first) { - -} - -GtkScale.trough, -GtkScale.trough.horizontal { - -} - -GtkScale.trough.vertical { - -} - - -GtkScale.progressbar.horizontal { - -} - -GtkScale.progressbar.vertical { - -} - GtkScale.slider, GtkScale.slider.horizontal, GtkScale.slider.horizontal:hover { -- cgit v1.2.1