From 7c0b6c841391900a3652ccb8cd11ac32e24c7f79 Mon Sep 17 00:00:00 2001
From: Sam Hewitt <sam@snwh.org>
Date: Fri, 20 Dec 2019 10:45:58 -0500
Subject: [PATCH] theme: use a widgets.scss file for widget import

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/904
---
 data/theme/gnome-shell-high-contrast.scss |  1 +
 data/theme/gnome-shell-sass/_common.scss  | 44 +++--------------------
 data/theme/gnome-shell-sass/_widgets.scss | 39 ++++++++++++++++++++
 data/theme/gnome-shell.scss               |  1 +
 4 files changed, 46 insertions(+), 39 deletions(-)
 create mode 100644 data/theme/gnome-shell-sass/_widgets.scss

diff --git a/data/theme/gnome-shell-high-contrast.scss b/data/theme/gnome-shell-high-contrast.scss
index cbd5fa41b..23a55eb86 100644
--- a/data/theme/gnome-shell-high-contrast.scss
+++ b/data/theme/gnome-shell-high-contrast.scss
@@ -3,6 +3,7 @@ $variant: 'light';
 @import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";
+@import "gnome-shell-sass/_widgets";
 
 //force symbolic icons
 stage {
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 72315c991..30dd6e475 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -63,40 +63,6 @@ stage {
   color: $fg_color;
 }
 
-/* WIDGETS */
-@import 'widgets/app-grid';
-@import 'widgets/app-switcher';
-@import 'widgets/buttons';
-@import 'widgets/calendar';
-@import 'widgets/check-box';
-@import 'widgets/corner-ripple';
-@import 'widgets/dash';
-@import 'widgets/dialogs';
-@import 'widgets/end-session-dialog';
-@import 'widgets/entries';
-@import 'widgets/hotplug';
-@import 'widgets/ibus-popup';
-@import 'widgets/keyboard';
-@import 'widgets/login-dialog';
-@import 'widgets/looking-glass';
-@import 'widgets/message-list';
-@import 'widgets/notifications';
-@import 'widgets/misc';
-@import 'widgets/network-dialog';
-@import 'widgets/osd';
-@import 'widgets/overview';
-@import 'widgets/panel';
-@import 'widgets/popovers';
-@import 'widgets/screen-shield';
-@import 'widgets/scrollbars';
-@import 'widgets/search-entry';
-@import 'widgets/search-results';
-@import 'widgets/slider';
-@import 'widgets/switches';
-@import 'widgets/tiled-previews';
-@import 'widgets/window-picker';
-@import 'widgets/workspace-switcher';
-
 /* Common Stylings */
 
 // Text
@@ -180,7 +146,7 @@ stage {
   border-color: $bubble_borders_color;
   border-style: solid;
   border-width: 0 !important;
-  border-top-width: 1px !important;
+  border-right-width: 1px !important;
   box-shadow:none !important;
 
   &:insensitive { @include button(insensitive);}
@@ -190,16 +156,16 @@ stage {
 
   // radius is 2 pixel less to fit in bubble
   &:first-child {
-    border-right-width: 1px !important;
-    border-radius: 0px 0px 0px $modal_radius - 2px;
+    border-radius: 0 0 0 $modal_radius - 2px;
   }
+
   &:last-child {
     border-right-width: 0 !important;
-    border-radius: 0px 0px $modal_radius - 2px 0px;
+    border-radius: 0 0 $modal_radius - 2px 0;
   }
   
   &:first-child:last-child {
-    border-radius: 0px 0px $modal_radius - 2px $modal_radius - 2px;
+    border-radius: 0 0 $modal_radius - 2px $modal_radius - 2px;
   }
 }
 
diff --git a/data/theme/gnome-shell-sass/_widgets.scss b/data/theme/gnome-shell-sass/_widgets.scss
new file mode 100644
index 000000000..d2552c5b9
--- /dev/null
+++ b/data/theme/gnome-shell-sass/_widgets.scss
@@ -0,0 +1,39 @@
+//
+// Shell widgets stylesheets are placed in separate .scss files
+// in 'widgets' and imported into the main stylesheet in this file.
+// To create or update a widget for the shell modify the list below.
+//
+
+/* WIDGETS */
+@import 'widgets/app-grid';
+@import 'widgets/app-switcher';
+@import 'widgets/buttons';
+@import 'widgets/calendar';
+@import 'widgets/check-box';
+@import 'widgets/corner-ripple';
+@import 'widgets/dash';
+@import 'widgets/dialogs';
+@import 'widgets/end-session-dialog';
+@import 'widgets/entries';
+@import 'widgets/hotplug';
+@import 'widgets/ibus-popup';
+@import 'widgets/keyboard';
+@import 'widgets/login-dialog';
+@import 'widgets/looking-glass';
+@import 'widgets/message-list';
+@import 'widgets/notifications';
+@import 'widgets/misc';
+@import 'widgets/network-dialog';
+@import 'widgets/osd';
+@import 'widgets/overview';
+@import 'widgets/panel';
+@import 'widgets/popovers';
+@import 'widgets/screen-shield';
+@import 'widgets/scrollbars';
+@import 'widgets/search-entry';
+@import 'widgets/search-results';
+@import 'widgets/slider';
+@import 'widgets/switches';
+@import 'widgets/tiled-previews';
+@import 'widgets/window-picker';
+@import 'widgets/workspace-switcher';
\ No newline at end of file
diff --git a/data/theme/gnome-shell.scss b/data/theme/gnome-shell.scss
index 3def5896c..8ee499912 100644
--- a/data/theme/gnome-shell.scss
+++ b/data/theme/gnome-shell.scss
@@ -3,3 +3,4 @@ $variant: 'dark';
 @import "gnome-shell-sass/_colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";
+@import "gnome-shell-sass/_widgets";