aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacco Geul <[email protected]>2016-04-14 17:48:05 +0200
committerJacco Geul <[email protected]>2016-04-14 17:48:05 +0200
commit4b2ed0dbc5f7065678d74cdaea27c6efd042fc9f (patch)
treee64a9a1b6758b7b3b9ef2aa6c4bb8971df62b1f6
parent9fc7681691476e61ab152d46978e61065aff2cd5 (diff)
Fix switch (on off toggle)
-rw-r--r--Breeze-dark-gtk/gtk-3.0/gtk.css35
-rwxr-xr-xBreeze-gtk/gtk-3.0/_common.scss15
-rw-r--r--Breeze-gtk/gtk-3.0/gtk-dark.css32
-rwxr-xr-xBreeze-gtk/gtk-3.0/gtk.css28
4 files changed, 64 insertions, 46 deletions
diff --git a/Breeze-dark-gtk/gtk-3.0/gtk.css b/Breeze-dark-gtk/gtk-3.0/gtk.css
index a23e8be..e4d47e0 100644
--- a/Breeze-dark-gtk/gtk-3.0/gtk.css
+++ b/Breeze-dark-gtk/gtk-3.0/gtk.css
@@ -2403,51 +2403,60 @@ scrollbars-junction.frame {
/**********
* Switch *
**********/
-switch {
+ switch {
-switch-slider-width: 30px;
font-weight: bold;
font-size: smaller;
outline-offset: 0px;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
- switch.trough {
+ switch {
border: 1px solid #696D71;
border-radius: 3px;
color: #EEEFF0;
background-image: none;
background-color: #31363B;
text-shadow: none; }
- switch.trough:active {
+ switch:active, switch:checked {
color: #3DADE8;
border-color: #3DADE8;
box-shadow: none;
text-shadow: none; }
- switch.trough:active:hover {
+ switch:active:hover {
border-color: #3DADE8; }
- switch.trough:hover {
+ switch:hover {
border-color: #3DADE8; }
- switch.trough:disabled {
+ switch:disabled {
color: #909396;
border-color: #696D71;
background-image: none;
background-color: #3a3f44;
box-shadow: none;
text-shadow: none; }
- switch.slider {
+ switch slider {
padding: 3px;
border: 3px solid;
border-radius: 3px;
border-color: rgba(255, 255, 255, 0);
box-shadow: none;
background-color: #696D71; }
- switch.slider:hover {
+ switch slider:hover {
box-shadow: none; }
- switch.slider:active {
+ switch slider:active {
background-color: #3DADE8; }
- switch.slider:active:hover {
+ switch slider:active:hover {
background-color: #3DADE8; }
- switch.slider:disabled {
- background-color: #3a3f44; }
-
+ switch slider:disabled {
+ background-color: #3a3f44; } row:selected switch {
+ box-shadow: none;
+ border-color: #3daee9; }
+ row:selected switch:backdrop {
+ border-color: #3daee9; }
+ row:selected switch slider:dir(rtl) {
+ border-left-color: #bdc3c7; }
+ row:selected switch slider:dir(ltr) {
+ border-right-color: #bdc3c7; }
+ row:selected switch slider, row:selected switch slider:active {
+ border-color: #3daee9; }
/*************************
* Check and Radio items *
*************************/
diff --git a/Breeze-gtk/gtk-3.0/_common.scss b/Breeze-gtk/gtk-3.0/_common.scss
index fe327cb..a969f90 100755
--- a/Breeze-gtk/gtk-3.0/_common.scss
+++ b/Breeze-gtk/gtk-3.0/_common.scss
@@ -2074,7 +2074,6 @@ switch {
box-shadow: inset 0 1px transparentize(white, 1); // needs to be set here
// otherwise it gets
// clipped
- &.trough {
// similar to the scale
border: 1px solid $borders_color;
border-radius: 3px;
@@ -2082,7 +2081,7 @@ switch {
background-image: none;
background-color: $bg_color;
text-shadow: none;
- &:active {
+ &:active, &:checked {
color: $selected_bg_color;
border-color: $selected_bg_color;
box-shadow: none;
@@ -2103,7 +2102,7 @@ switch {
}
- &.slider {
+ slider {
padding: 3px;
border: 3px solid;
border-radius: 3px;
@@ -2120,15 +2119,15 @@ switch {
&:disabled { background-color: $insensitive_bg_color; }
}
- list-row:selected & {
+ row:selected &, infobar & {
@if $variant == 'light' {
box-shadow: none;
border-color: $selected_borders_color;
&:backdrop { border-color: $selected_borders_color; }
- &.slider:dir(rtl) { border-left-color: $borders_color; }
- &.slider:dir(ltr) { border-right-color: $borders_color; }
- &.slider,
- &.slider:active { border-color: $selected_borders_color; }
+ slider:dir(rtl) { border-left-color: $borders_color; }
+ slider:dir(ltr) { border-right-color: $borders_color; }
+ slider,
+ slider:active { border-color: $selected_borders_color; }
}
}
diff --git a/Breeze-gtk/gtk-3.0/gtk-dark.css b/Breeze-gtk/gtk-3.0/gtk-dark.css
index 45914d7..12d4804 100644
--- a/Breeze-gtk/gtk-3.0/gtk-dark.css
+++ b/Breeze-gtk/gtk-3.0/gtk-dark.css
@@ -2409,44 +2409,54 @@ switch {
font-size: smaller;
outline-offset: 0px;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
- switch.trough {
+ switch {
border: 1px solid #696D71;
border-radius: 3px;
color: #EEEFF0;
background-image: none;
background-color: #31363B;
text-shadow: none; }
- switch.trough:active {
+ switch:active, switch:checked {
color: #3DADE8;
border-color: #3DADE8;
box-shadow: none;
text-shadow: none; }
- switch.trough:active:hover {
+ switch:active:hover {
border-color: #3DADE8; }
- switch.trough:hover {
+ switch:hover {
border-color: #3DADE8; }
- switch.trough:disabled {
+ switch:disabled {
color: #909396;
border-color: #696D71;
background-image: none;
background-color: #3a3f44;
box-shadow: none;
text-shadow: none; }
- switch.slider {
+ switch slider {
padding: 3px;
border: 3px solid;
border-radius: 3px;
border-color: rgba(255, 255, 255, 0);
box-shadow: none;
background-color: #696D71; }
- switch.slider:hover {
+ switch slider:hover {
box-shadow: none; }
- switch.slider:active {
+ switch slider:active {
background-color: #3DADE8; }
- switch.slider:active:hover {
+ switch slider:active:hover {
background-color: #3DADE8; }
- switch.slider:disabled {
- background-color: #3a3f44; }
+ switch slider:disabled {
+ background-color: #3a3f44; } row:selected switch {
+ box-shadow: none;
+ border-color: #3daee9; }
+ row:selected switch:backdrop {
+ border-color: #3daee9; }
+ row:selected switch slider:dir(rtl) {
+ border-left-color: #bdc3c7; }
+ row:selected switch slider:dir(ltr) {
+ border-right-color: #bdc3c7; }
+ row:selected switch slider, row:selected switch slider:active {
+ border-color: #3daee9; }
/*************************
* Check and Radio items *
diff --git a/Breeze-gtk/gtk-3.0/gtk.css b/Breeze-gtk/gtk-3.0/gtk.css
index 3ec24b7..e407c30 100755
--- a/Breeze-gtk/gtk-3.0/gtk.css
+++ b/Breeze-gtk/gtk-3.0/gtk.css
@@ -2410,54 +2410,54 @@ switch {
font-size: smaller;
outline-offset: 0px;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
- switch.trough {
+ switch {
border: 1px solid #bdc3c7;
border-radius: 3px;
color: #31363b;
background-image: none;
background-color: #eff0f1;
text-shadow: none; }
- switch.trough:active {
+ switch:active, switch:checked {
color: #3daee9;
border-color: #3daee9;
box-shadow: none;
text-shadow: none; }
- switch.trough:active:hover {
+ switch:active:hover {
border-color: #93cee9; }
- switch.trough:hover {
+ switch:hover {
border-color: #3daee9; }
- switch.trough:disabled {
+ switch:disabled {
color: #909396;
border-color: #bdc3c7;
background-image: none;
background-color: #e6e7e8;
box-shadow: none;
text-shadow: none; }
- switch.slider {
+ switch slider {
padding: 3px;
border: 3px solid;
border-radius: 3px;
border-color: rgba(255, 255, 255, 0);
box-shadow: none;
background-color: #bdc3c7; }
- switch.slider:hover {
+ switch slider:hover {
box-shadow: none; }
- switch.slider:active {
+ switch slider:active {
background-color: #3daee9; }
- switch.slider:active:hover {
+ switch slider:active:hover {
background-color: #93cee9; }
switch.slider:disabled {
background-color: #e6e7e8; }
- list-row:selected switch {
+ row:selected switch {
box-shadow: none;
border-color: #3daee9; }
- list-row:selected switch:backdrop {
+ row:selected switch:backdrop {
border-color: #3daee9; }
- list-row:selected switch.slider:dir(rtl) {
+ row:selected switch slider:dir(rtl) {
border-left-color: #bdc3c7; }
- list-row:selected switch.slider:dir(ltr) {
+ row:selected switch slider:dir(ltr) {
border-right-color: #bdc3c7; }
- list-row:selected switch.slider, list-row:selected switch.slider:active {
+ row:selected switch slider, row:selected switch slider:active {
border-color: #3daee9; }
/*************************