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.16/gtk-dark.css | 4 ++++ common/gtk-3.0/3.16/gtk-darker.css | 4 ++++ common/gtk-3.0/3.16/gtk-solid-dark.css | 4 ++++ common/gtk-3.0/3.16/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.16/gtk-solid.css | 4 ++++ common/gtk-3.0/3.16/gtk.css | 4 ++++ common/gtk-3.0/3.16/sass/_common.scss | 1 + 7 files changed, 25 insertions(+) (limited to 'common/gtk-3.0/3.16') diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index e73cfe1..1497a4e 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -1609,6 +1609,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1620,6 +1621,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1631,6 +1633,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1642,6 +1645,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { 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.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index e3eb905..d721e4e 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -1612,6 +1612,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1623,6 +1624,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1634,6 +1636,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1645,6 +1648,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { 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.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index 70dc688..42ef291 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -1609,6 +1609,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1620,6 +1621,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1631,6 +1633,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1642,6 +1645,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { 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.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index 485c697..59309be 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -1612,6 +1612,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1623,6 +1624,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1634,6 +1636,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1645,6 +1648,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { 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.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index f4dfbe9..86e2b70 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -1612,6 +1612,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1623,6 +1624,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1634,6 +1636,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1645,6 +1648,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { 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.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 7a96f3a..104e7c5 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -1612,6 +1612,7 @@ GtkSwitch { GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } +.menu .menuitem:hover GtkSwitch.trough, .list-row:selected GtkSwitch.trough, GtkInfoBar GtkSwitch.trough { background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } @@ -1623,6 +1624,7 @@ GtkInfoBar GtkSwitch.trough { GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active, .list-row:selected GtkSwitch.trough:active, GtkInfoBar GtkSwitch.trough:active { background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } @@ -1634,6 +1636,7 @@ GtkInfoBar GtkSwitch.trough:active { GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:insensitive, .list-row:selected GtkSwitch.trough:insensitive, GtkInfoBar GtkSwitch.trough:insensitive { background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } @@ -1645,6 +1648,7 @@ GtkInfoBar GtkSwitch.trough:insensitive { GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } +.menu .menuitem:hover GtkSwitch.trough:active:insensitive, .list-row:selected GtkSwitch.trough:active:insensitive, GtkInfoBar GtkSwitch.trough:active:insensitive { 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.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 85e00f3..9850650 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1970,6 +1970,7 @@ GtkSwitch { background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); } + .menu .menuitem:hover GtkSwitch.trough#{$k}, .list-row:selected GtkSwitch.trough#{$k}, GtkInfoBar GtkSwitch.trough#{$k} { background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); -- cgit v1.2.3