diff --git a/Paper/gnome-shell/gnome-shell.css b/Paper/gnome-shell/gnome-shell.css
index 4dbcd60..5b602c4 100644
--- a/Paper/gnome-shell/gnome-shell.css
+++ b/Paper/gnome-shell/gnome-shell.css
@@ -846,7 +846,7 @@ StScrollBar {
border: none; }
#appMenu {
- /*spinner-image: url("assets/process-working.svg"); Broken, not compatible with 60 fps. See https://github.com/theRealPadster/Mist-theme/issues/4 */
+ /*spinner-image: url("assets/process-working.svg"); Broken, not compatible with 60 fps */
spinner-image: url("resource:///org/gnome/shell/theme/process-working.svg");
spacing: 4px; }
#appMenu .label-shadow {
diff --git a/Paper/gtk-3.0/apps/gnome-software.css b/Paper/gtk-3.0/apps/gnome-software.css
index 209cc77..f6e2991 100644
--- a/Paper/gtk-3.0/apps/gnome-software.css
+++ b/Paper/gtk-3.0/apps/gnome-software.css
@@ -38,7 +38,7 @@
background-color: @tag;
background: @tag;
border:none;
- color: shade(@tag. 0.8);
+ color: shade(@tag, 0.8);
}
.kudo-label.label {
diff --git a/Paper/gtk-3.0/assets/scalable/switch-off-disabled.svg b/Paper/gtk-3.0/assets/scalable/switch-off-disabled.svg
deleted file mode 100644
index 0d9d703..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-off-disabled.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-off-disabled@2.svg b/Paper/gtk-3.0/assets/scalable/switch-off-disabled@2.svg
deleted file mode 100644
index ca1e2ee..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-off-disabled@2.svg
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-off.svg b/Paper/gtk-3.0/assets/scalable/switch-off.svg
deleted file mode 100644
index 525d2c2..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-off.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-off@2.svg b/Paper/gtk-3.0/assets/scalable/switch-off@2.svg
deleted file mode 100644
index f0eb323..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-off@2.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on-dark.svg b/Paper/gtk-3.0/assets/scalable/switch-on-dark.svg
deleted file mode 100644
index 2f886f7..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-on-dark.svg
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on-dark@2.svg b/Paper/gtk-3.0/assets/scalable/switch-on-dark@2.svg
deleted file mode 100644
index c463bb7..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-on-dark@2.svg
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on-disabled.svg b/Paper/gtk-3.0/assets/scalable/switch-on-disabled.svg
deleted file mode 100644
index df2e698..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-on-disabled.svg
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on-disabled@2.svg b/Paper/gtk-3.0/assets/scalable/switch-on-disabled@2.svg
deleted file mode 100644
index 4ae4a26..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-on-disabled@2.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on.svg b/Paper/gtk-3.0/assets/scalable/switch-on.svg
deleted file mode 100644
index 31ee091..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-on.svg
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on@2.svg b/Paper/gtk-3.0/assets/scalable/switch-on@2.svg
deleted file mode 100644
index a2ad426..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-on@2.svg
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-dark.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-dark.svg
deleted file mode 100644
index d104e3f..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-dark.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-dark@2.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-dark@2.svg
deleted file mode 100644
index 2cf9177..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-dark@2.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark.svg
deleted file mode 100644
index 9b84b01..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark@2.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark@2.svg
deleted file mode 100644
index da4fd55..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark@2.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive.svg
deleted file mode 100644
index 7371825..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive@2.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive@2.svg
deleted file mode 100644
index 45cabf7..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive@2.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider.svg b/Paper/gtk-3.0/assets/scalable/switch-slider.svg
deleted file mode 100644
index a713f87..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider@2.svg b/Paper/gtk-3.0/assets/scalable/switch-slider@2.svg
deleted file mode 100644
index 0766a63..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider@2.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
diff --git a/Paper/gtk-3.0/gtk-widgets-assets.css b/Paper/gtk-3.0/gtk-widgets-assets.css
index 8580f3a..ccc7e6d 100644
--- a/Paper/gtk-3.0/gtk-widgets-assets.css
+++ b/Paper/gtk-3.0/gtk-widgets-assets.css
@@ -273,54 +273,6 @@
background: url("assets/scalable/resize-grip.svg");
}
-/*************
- * GtkSwitch *
- *************/
-
-
-GtkSwitch.trough {
- background: -gtk-scaled(url("assets/scalable/switch-off.svg"),url("assets/scalable/switch-off@2.svg"));
- background-repeat: no-repeat;
- background-position: 0 center;
-}
-
-GtkSwitch.trough:active {
- background: -gtk-scaled(url("assets/scalable/switch-on.svg"),url("assets/scalable/switch-on@2.svg"));
- background-repeat: no-repeat;
- background-position: 0 center;
-}
-
-GtkSwitch.trough:insensitive {
- background: -gtk-scaled(url("assets/scalable/switch-off-disabled.svg"),url("assets/scalable/switch-off-disabled@2.svg"));
- background-repeat: no-repeat;
- background-position: 0 center;
-}
-
-GtkSwitch.trough:active:insensitive {
- background: -gtk-scaled(url("assets/scalable/switch-on-disabled.svg"),url("assets/scalable/switch-on-disabled@2.svg"));
- background-repeat: no-repeat;
- background-position: 0 center;
-}
-
-GtkSwitch.slider {
- background: -gtk-scaled(url("assets/scalable/switch-slider.svg"),url("assets/scalable/switch-slider@2.svg"));
- background-repeat: no-repeat;
- background-position: 0 center;
-}
-
-GtkSwitch.slider:focus {
- background: -gtk-scaled(url("assets/scalable/switch-slider.svg"),url("assets/scalable/switch-slider@2.svg"));
- background-repeat: no-repeat;
- background-position: 0 center;
-}
-
-GtkSwitch.slider:insensitive {
- background: -gtk-scaled(url("assets/scalable/switch-slider-insensitive.svg"),url("assets/scalable/switch-slider-insensitive@2.svg"));
- background-repeat: no-repeat;
- background-position: 0 center;
-}
-
-
/*********************
* GtkScale's slider *
*********************/
diff --git a/Paper/gtk-3.0/widgets/switches.css b/Paper/gtk-3.0/widgets/switches.css
index e232f67..56ed0a7 100644
--- a/Paper/gtk-3.0/widgets/switches.css
+++ b/Paper/gtk-3.0/widgets/switches.css
@@ -16,8 +16,10 @@
* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
*/
-/* Slider colors */
-@define-color slider_border @trough_border;
+@define-color switch_trough_active #9fb0b9;
+
+@define-color switch_slider #ffffff;
+@define-color switch_slider_border @trough_border;
@define-color backdrop_slider_border @backdrop_trough_border;
@@ -25,73 +27,52 @@
* GtkSwitch *
*************/
-/*GtkSwitch {
- font: condensed;
+GtkSwitch {
+ font: 1;
+ /*min-height: 24px;
+ min-width: 24px; FIXME: Uncomment for 3.19 */
+ -GtkSwitch-slider-width: 20;
+ -GtkSwitch-slider-height: 20;
+ transition: all 200ms ease-in;
}
GtkSwitch.trough {
- border-radius: 1em;
- border: 1px solid @trough_border;
- background-color: @background;
- color: @trough_border;
+ background-color: alpha (#000, 0.2);
+ border: none;
+ border-radius: 14px;
+ color: transparent;
+ padding: 2px;
}
GtkSwitch.trough:active {
- border: 1px solid @selection;
- background-color: alpha(@selection, 0.2);
- color: @selection;
+ background-color: @switch_trough_active;
}
-GtkSwitch.trough:backdrop,
-GtkSwitch.trough:active:backdrop {
- border: 1px solid @backdrop_trough_border;
- background-color: @backdrop_background;
- color: @backdrop_trough_border;
+GtkSwitch.trough:insensitive {
+ background-color: alpha (#000, 0.2);
}
-GtkSwitch.trough:insensitive,
+GtkSwitch.trough:active:backdrop,
GtkSwitch.trough:active:insensitive {
- background: none;
- border: 1px solid @insensitive_text;
- color: @insensitive_text;
+ background-color: alpha (@switch_trough_active, 0.5);
}
GtkSwitch.slider {
- background-color: @slider_border;
+ background-color: @switch_slider;
+ border: none;
+ border-radius: 50%;
+
+ box-shadow: 0 2px 2px alpha (#000, 0.2),
+ 0 1px 2px alpha (#000, 0.2);
+ padding: 2px;
}
-GtkSwitch.slider:active {
- background-color: @selection;
+GtkSwitch.slider:focus {
+ background-color: @switch_slider;
}
-GtkSwitch.slider:active:insensitive,
-GtkSwitch.slider:insensitive {
- background-color: @insensitive_text;
-}
-
-GtkSwitch.slider:active:backdrop,
+GtkSwitch.slider:insensitive,
GtkSwitch.slider:backdrop {
- background-color: @backdrop_slider_border;
-}*/
-
-
-GtkSwitch {
- font: 1;
- border: none;
- -GtkSwitch-slider-width: 46;
-}
-
-GtkSwitch.trough {
- color: transparent;
- border: none;
+ background-color: @switch_slider;
box-shadow: none;
-}
-
-GtkSwitch:backdrop,
-GtkSwitch:insensitive,
-GtkSwitch:backdrop:insensitive,
-GtkSwitch.trough:backdrop,
-GtkSwitch.trough:insensitive,
-GtkSwitch.trough:backdrop:insensitive {
- border: none;
}
\ No newline at end of file