From 924cfb92065aa8fe64da2e271dd014de2d0187c2 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 22 Jun 2015 23:00:17 +0200 Subject: some switch tweaks --- common/gtk-3.0/3.16/_common.scss | 14 +++++++-- common/gtk-3.0/3.16/assets.svg | 30 +++++++++---------- common/gtk-3.0/3.16/assets/switch-header-dark.png | Bin 1000 -> 982 bytes .../gtk-3.0/3.16/assets/switch-header-dark@2.png | Bin 2051 -> 1985 bytes .../gtk-3.0/3.16/assets/switch-header-darker.png | Bin 1000 -> 971 bytes .../gtk-3.0/3.16/assets/switch-header-darker@2.png | Bin 2051 -> 1925 bytes .../3.16/assets/switch-insensitive-header-dark.png | Bin 1035 -> 1009 bytes .../assets/switch-insensitive-header-dark@2.png | Bin 2099 -> 2084 bytes .../assets/switch-insensitive-header-darker.png | Bin 1035 -> 993 bytes .../assets/switch-insensitive-header-darker@2.png | Bin 2099 -> 2021 bytes common/gtk-3.0/3.16/gtk-contained-dark.css | 32 ++++++++++++++++++--- common/gtk-3.0/3.16/gtk-contained-darker.css | 29 +++++++++++++++++-- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 32 ++++++++++++++++++--- common/gtk-3.0/3.16/gtk-contained-solid.css | 24 ++++++++++++++++ common/gtk-3.0/3.16/gtk-contained.css | 24 ++++++++++++++++ 15 files changed, 157 insertions(+), 28 deletions(-) (limited to 'common/gtk-3.0') diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss index 2e705c0..d6a187e 100644 --- a/common/gtk-3.0/3.16/_common.scss +++ b/common/gtk-3.0/3.16/_common.scss @@ -1328,9 +1328,13 @@ GtkComboBox { &:insensitive { background-image: linear-gradient(to bottom, transparentize($header_fg, 0.7)); } } &.slider { - background-image: linear-gradient(to bottom, mix($base_color, $header_bg, 90%)); + background-image: linear-gradient(to bottom, if($darker == 'false', mix($base_color, $header_bg, 90%), darken($header_bg, 4%))); - &:insensitive { background-image: linear-gradient(to bottom, mix($base_color, $header_bg, 40%)); } + &:insensitive { + background-image: linear-gradient(to bottom, if($darker == 'false', mix($base_color, $header_bg, 40%), darken($header_bg, 1%))); + + @if $darker=='true' { border-color: mix($header_bg, $selected_bg_color, 60%); } + } } } } @@ -1908,7 +1912,11 @@ GtkSwitch { // load switch troughs from .png files in assets directory #{$i}GtkSwitch.trough#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}#{$j}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$j}#{$asset_suffix}@2.png")); + 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}, diff --git a/common/gtk-3.0/3.16/assets.svg b/common/gtk-3.0/3.16/assets.svg index ad09be3..7eb6e73 100644 --- a/common/gtk-3.0/3.16/assets.svg +++ b/common/gtk-3.0/3.16/assets.svg @@ -24,9 +24,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="81.888882" - inkscape:cy="57.67063" + inkscape:zoom="2.8284271" + inkscape:cx="210.11124" + inkscape:cy="175.74821" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -4630,7 +4630,7 @@ x="0" y="1029.3622" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#202328;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#202328;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.99999999;fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.99999999;fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />