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.18/gtk-dark.css | 4 ++++ common/gtk-3.0/3.18/gtk-darker.css | 4 ++++ common/gtk-3.0/3.18/gtk-solid-dark.css | 4 ++++ common/gtk-3.0/3.18/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.18/gtk-solid.css | 4 ++++ common/gtk-3.0/3.18/gtk.css | 4 ++++ common/gtk-3.0/3.18/sass/_common.scss | 1 + 7 files changed, 25 insertions(+) (limited to 'common/gtk-3.0/3.18') diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index f995938..76c5335 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -1679,6 +1679,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")); } @@ -1690,6 +1691,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")); } @@ -1701,6 +1703,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")); } @@ -1712,6 +1715,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.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 9ced93b..fd52416 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -1682,6 +1682,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")); } @@ -1693,6 +1694,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")); } @@ -1704,6 +1706,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")); } @@ -1715,6 +1718,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.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 433364e..00b1933 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -1679,6 +1679,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")); } @@ -1690,6 +1691,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")); } @@ -1701,6 +1703,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")); } @@ -1712,6 +1715,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.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index b03e798..b7457dd 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -1682,6 +1682,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")); } @@ -1693,6 +1694,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")); } @@ -1704,6 +1706,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")); } @@ -1715,6 +1718,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.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 274f3f1..6cee8b6 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -1686,6 +1686,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")); } @@ -1697,6 +1698,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")); } @@ -1708,6 +1710,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")); } @@ -1719,6 +1722,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.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 4321388..bc208a6 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -1686,6 +1686,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")); } @@ -1697,6 +1698,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")); } @@ -1708,6 +1710,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")); } @@ -1719,6 +1722,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.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 028aa41..a20f5d6 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1916,6 +1916,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