scss: fix deprecation warnings

spacing mixin uses the parent selector so it has to go after all other styles

3 files changed, 15 insertions, 12 deletions

diff --git a/scss/bar.scss b/scss/bar.scss
index b3f5d92..9512112 100644
--- a/scss/bar.scss
+++ b/scss/bar.scss
@@ -6,7 +6,6 @@
 .bar {
     @include lib.rounded(10, $tl: 0, $tr: 0);
     @include lib.border(scheme.$rosewater, 0.7, 2);
-    @include lib.spacing(10);
     @include font.mono;
 
     border-top: none;
@@ -14,16 +13,19 @@
     padding: lib.s(8) lib.s(20);
     font-size: lib.s(14);
 
+    @include lib.spacing(10);
+
     & > * {
         @include lib.spacing(10);
     }
 
     .module {
         @include lib.rounded(5);
-        @include lib.spacing;
 
         padding: lib.s(3) lib.s(8);
         background-color: scheme.$surface0;
+
+        @include lib.spacing;
     }
 
     label.icon {
@@ -43,10 +45,10 @@
     }
 
     .media-playing {
-        @include lib.spacing(8);
-
         color: scheme.$lavender;
 
+        @include lib.spacing(8);
+
         icon {
             font-size: lib.s(16);
         }
@@ -77,9 +79,9 @@
     }
 
     .tray {
-        @include lib.spacing(10);
-
         font-size: lib.s(15);
+
+        @include lib.spacing(10);
     }
 
     .notifications {
diff --git a/scss/launcher.scss b/scss/launcher.scss
index eddbc88..6fe9035 100644
--- a/scss/launcher.scss
+++ b/scss/launcher.scss
@@ -14,11 +14,11 @@
     padding: lib.s(10) lib.s(14);
 
     .search-bar {
-        @include lib.spacing;
-
         margin-bottom: lib.s(5);
         font-size: lib.s(16);
 
+        @include lib.spacing;
+
         .icon {
             font-size: lib.s(18);
             color: scheme.$sapphire;
@@ -54,10 +54,10 @@
 
     .results {
         .empty {
-            @include lib.spacing;
-
             color: scheme.$subtext0;
 
+            @include lib.spacing;
+
             .icon {
                 font-size: lib.s(32);
             }
diff --git a/scss/notifpopups.scss b/scss/notifpopups.scss
index aef9efe..325cb7b 100644
--- a/scss/notifpopups.scss
+++ b/scss/notifpopups.scss
@@ -26,7 +26,6 @@
     }
 
     .popup {
-        @include lib.spacing($vertical: true);
         @include lib.rounded(8, $tr: 0, $br: 0);
         @include lib.shadow;
         @include font.main;
@@ -36,6 +35,8 @@
         color: scheme.$text;
         padding: lib.s(10) lib.s(12);
 
+        @include lib.spacing($vertical: true);
+
         &.low {
             @include popup(scheme.$overlay0);
         }
@@ -51,8 +52,8 @@
     }
 
     .header {
-        @include lib.spacing(5);
         @include font.mono;
+        @include lib.spacing(5);
     }
 
     .content {