diff options
21 files changed, 42 insertions, 789 deletions
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 2499318..bc7223c 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -1753,46 +1753,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index 15f7519..14e2426 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -1756,46 +1756,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index 72b79c0..5bbd0f7 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -1753,46 +1753,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 8034ed4..4468155 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -1756,46 +1756,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index d119cc4..18ebb53 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -1756,46 +1756,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index fdf821d..79dfc5a 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -1756,46 +1756,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 9b0430f..34e4284 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1906,33 +1906,24 @@ GtkSwitch { } } -@each $i,$j in ('',''), ('.list-row:selected ','-selected') { +@each $k,$l in ('',''), + (':active','-active'), + (':insensitive','-insensitive'), + (':active:insensitive','-active-insensitive') { - @each $k,$l in ('',''), - (':active','-active'), - (':insensitive','-insensitive'), - (':active:insensitive','-active-insensitive') { + // load switch troughs from .png files in assets directory - // load switch troughs from .png files in assets directory - - #{$i}GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); - } - - .list-row:selected GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); - } - - .header-bar GtkSwitch.trough#{$k}, - .primary-toolbar GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}-header#{$darker_asset_suffix}.png"),url("assets/switch#{$l}-header#{$darker_asset_suffix}@2.png")); - } + GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); + } - // load switch sliders from .png files in assets directory + .list-row:selected GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); + } - //#{$i}GtkSwitch.slider#{$k} { - // background-image: -gtk-scaled(url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}.png"),url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}@2.png")); - //} + .header-bar GtkSwitch.trough#{$k}, + .primary-toolbar GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}-header#{$darker_asset_suffix}.png"),url("assets/switch#{$l}-header#{$darker_asset_suffix}@2.png")); } } diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 3a22af4..1f60dcc 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -1811,46 +1811,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 1ccf8f8..0e59cad 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -1814,46 +1814,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index a493a11..3470999 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -1811,46 +1811,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index bd60479..52020c1 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -1814,46 +1814,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 7d4a818..a7ed582 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -1814,46 +1814,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 549b42f..9ffb28b 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -1814,46 +1814,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 398f688..7046ae5 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -2014,33 +2014,24 @@ GtkSwitch { } } -@each $i,$j in ('',''), ('.list-row:selected ','-selected') { +@each $k,$l in ('',''), + (':active','-active'), + (':insensitive','-insensitive'), + (':active:insensitive','-active-insensitive') { - @each $k,$l in ('',''), - (':active','-active'), - (':insensitive','-insensitive'), - (':active:insensitive','-active-insensitive') { + // load switch troughs from .png files in assets directory - // load switch troughs from .png files in assets directory - - #{$i}GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); - } - - .list-row:selected GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); - } - - .header-bar GtkSwitch.trough#{$k}, - .primary-toolbar GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}-header#{$darker_asset_suffix}.png"),url("assets/switch#{$l}-header#{$darker_asset_suffix}@2.png")); - } + GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); + } - // load switch sliders from .png files in assets directory + .list-row:selected GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); + } - //#{$i}GtkSwitch.slider#{$k} { - // background-image: -gtk-scaled(url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}.png"),url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}@2.png")); - //} + .header-bar GtkSwitch.trough#{$k}, + .primary-toolbar GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}-header#{$darker_asset_suffix}.png"),url("assets/switch#{$l}-header#{$darker_asset_suffix}@2.png")); } } diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css index 2f2f527..fdb4788 100644 --- a/common/gtk-3.0/3.18/gtk-contained-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-dark.css @@ -1942,46 +1942,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css index 45eca1a..2f18d1f 100644 --- a/common/gtk-3.0/3.18/gtk-contained-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-darker.css @@ -1945,46 +1945,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css index 157b5de..d7ff02b 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css @@ -1942,46 +1942,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css index dccf0c4..696cab6 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css @@ -1945,46 +1945,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css index 899827b..3a5e675 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid.css @@ -1949,46 +1949,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index 192c970..54fb236 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -1949,46 +1949,6 @@ GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } - -.list-row:selected GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); } - -.header-bar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough { - background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } - -.list-row:selected GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); } - -.header-bar GtkSwitch.trough:active, -.primary-toolbar GtkSwitch.trough:active { - background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive { - background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } - -.list-row:selected GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); } - -.header-bar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } - /************************* * Check and Radio items * *************************/ diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 9dea751..0b492d5 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -2114,33 +2114,24 @@ GtkSwitch { } } -@each $i,$j in ('',''), ('.list-row:selected ','-selected') { +@each $k,$l in ('',''), + (':active','-active'), + (':insensitive','-insensitive'), + (':active:insensitive','-active-insensitive') { - @each $k,$l in ('',''), - (':active','-active'), - (':insensitive','-insensitive'), - (':active:insensitive','-active-insensitive') { + // load switch troughs from .png files in assets directory - // load switch troughs from .png files in assets directory - - #{$i}GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); - } - - .list-row:selected GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); - } - - .header-bar GtkSwitch.trough#{$k}, - .primary-toolbar GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}-header#{$darker_asset_suffix}.png"),url("assets/switch#{$l}-header#{$darker_asset_suffix}@2.png")); - } + GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); + } - // load switch sliders from .png files in assets directory + .list-row:selected GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); + } - //#{$i}GtkSwitch.slider#{$k} { - // background-image: -gtk-scaled(url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}.png"),url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}@2.png")); - //} + .header-bar GtkSwitch.trough#{$k}, + .primary-toolbar GtkSwitch.trough#{$k} { + background-image: -gtk-scaled(url("assets/switch#{$l}-header#{$darker_asset_suffix}.png"),url("assets/switch#{$l}-header#{$darker_asset_suffix}@2.png")); } } |