From 65b1e04f13b40a3c0a569d4ff1294b189e18dccb Mon Sep 17 00:00:00 2001
From: nana-4 <hnmaigo@gmail.com>
Date: Mon, 20 Jan 2020 01:41:44 +0900
Subject: [PATCH] theme: Move accessibility-related selectors into _a11y.scss

Since we have several accessibility-related selectors, it makes sense
to collect them in one stylesheet.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/938
---
 data/theme/gnome-shell-sass/_widgets.scss     |  1 +
 .../theme/gnome-shell-sass/widgets/_a11y.scss | 24 +++++++++++++++++++
 .../widgets/_corner-ripple.scss               |  9 -------
 .../theme/gnome-shell-sass/widgets/_misc.scss | 15 ------------
 data/theme/meson.build                        |  1 +
 5 files changed, 26 insertions(+), 24 deletions(-)
 create mode 100644 data/theme/gnome-shell-sass/widgets/_a11y.scss

diff --git a/data/theme/gnome-shell-sass/_widgets.scss b/data/theme/gnome-shell-sass/_widgets.scss
index 48d440f58..5df4ecd61 100644
--- a/data/theme/gnome-shell-sass/_widgets.scss
+++ b/data/theme/gnome-shell-sass/_widgets.scss
@@ -40,6 +40,7 @@
 @import 'widgets/app-grid';
 @import 'widgets/dash';
 // A11y / misc
+@import 'widgets/a11y';
 @import 'widgets/misc';
 @import 'widgets/tiled-previews';
 @import 'widgets/keyboard';
diff --git a/data/theme/gnome-shell-sass/widgets/_a11y.scss b/data/theme/gnome-shell-sass/widgets/_a11y.scss
new file mode 100644
index 000000000..31b5c4b7e
--- /dev/null
+++ b/data/theme/gnome-shell-sass/widgets/_a11y.scss
@@ -0,0 +1,24 @@
+// Pointer location
+.ripple-pointer-location {
+  width: $ripple_size;
+  height: $ripple_size;
+  border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
+  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
+  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
+}
+
+// Pointer accessibility notifications
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: $selected_bg_color;
+  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
+}
+
+// Screen zoom/Magnifier
+.magnifier-zoom-region {
+  border: 2px solid $selected_bg_color;
+
+  &.full-screen { border-width: 0; }
+}
diff --git a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
index fb022e407..9137b67ca 100644
--- a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
+++ b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -13,12 +13,3 @@ $ripple_size: 50px;
   // just a simple change to the border radius position
   &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
 }
-
-// Pointer location
-.ripple-pointer-location {
-  width: $ripple_size;
-  height: $ripple_size;
-  border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
-  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
-  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
-}
diff --git a/data/theme/gnome-shell-sass/widgets/_misc.scss b/data/theme/gnome-shell-sass/widgets/_misc.scss
index fd6613dae..554a31612 100644
--- a/data/theme/gnome-shell-sass/widgets/_misc.scss
+++ b/data/theme/gnome-shell-sass/widgets/_misc.scss
@@ -7,21 +7,6 @@
   border: 1px solid $selected_bg_color;
 }
 
-// Pointer accessibility notifications
-.pie-timer {
-  width: 60px;
-  height: 60px;
-  -pie-border-width: 3px;
-  -pie-border-color: $selected_bg_color;
-  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-}
-
-// Screen zoom/Magnifier
-.magnifier-zoom-region {
-  border: 2px solid $selected_bg_color;
-  &.full-screen { border-width: 0; }
-}
-
 // User icon
 .user-icon {
   background-size: contain;
diff --git a/data/theme/meson.build b/data/theme/meson.build
index 6305b590f..fdcb69fce 100644
--- a/data/theme/meson.build
+++ b/data/theme/meson.build
@@ -6,6 +6,7 @@ theme_sources = files([
   'gnome-shell-sass/_drawing.scss',
   'gnome-shell-sass/_high-contrast-colors.scss',
   'gnome-shell-sass/_widgets.scss',
+  'gnome-shell-sass/widgets/_a11y.scss',
   'gnome-shell-sass/widgets/_app-grid.scss',
   'gnome-shell-sass/widgets/_app-switcher.scss',
   'gnome-shell-sass/widgets/_base.scss',