From 2f80d3ccf8171e12a26b8d329cb51c6b0db7f083 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 1 Jun 2016 20:00:36 +0200 Subject: fix switches in selected menuitems (fix #556) --- common/gtk-3.0/3.20/gtk-dark.css | 4 ++++ common/gtk-3.0/3.20/gtk-darker.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid-dark.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid.css | 4 ++++ common/gtk-3.0/3.20/gtk.css | 4 ++++ common/gtk-3.0/3.20/sass/_common.scss | 1 + 7 files changed, 25 insertions(+) (limited to 'common/gtk-3.0/3.20') diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index c37914f..98ea97e 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1854,6 +1854,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1865,6 +1866,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1876,6 +1878,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1887,6 +1890,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 14db475..f735403 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1853,6 +1853,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1864,6 +1865,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1875,6 +1877,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1886,6 +1889,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 8dac95e..4165e5b 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1854,6 +1854,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1865,6 +1866,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1876,6 +1878,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1887,6 +1890,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index d184701..dac6610 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1853,6 +1853,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1864,6 +1865,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1875,6 +1877,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1886,6 +1889,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index fe5a598..20305dc 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1857,6 +1857,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1868,6 +1869,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1879,6 +1881,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1890,6 +1893,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 1ebb175..bc24bb5 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1857,6 +1857,7 @@ switch { switch { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +menuitem:hover switch, row:selected switch, infobar switch { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1868,6 +1869,7 @@ headerbar switch, switch:checked { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +menuitem:hover switch:checked, row:selected switch:checked, infobar switch:checked { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1879,6 +1881,7 @@ headerbar switch:checked, switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +menuitem:hover switch:disabled, row:selected switch:disabled, infobar switch:disabled { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1890,6 +1893,7 @@ headerbar switch:disabled, switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +menuitem:hover switch:checked:disabled, row:selected switch:checked:disabled, infobar switch:checked:disabled { background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index ed35b4c..4f36e35 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1970,6 +1970,7 @@ switch { background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); } + menuitem:hover switch#{$k}, row:selected switch#{$k}, infobar switch#{$k} { background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); -- cgit v1.2.3