From 6fdf21b89e3af0296995fe1abefff15c09f12649 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Mon, 19 Aug 2024 13:50:57 +0200
Subject: [PATCH] css: move CSS declarations above nested rules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new SASS version warns that decelerations should appear above nested
rules. This change should not have any visual impact.

> ▲ [WARNING] Sass's behavior for declarations that appear after nested
rules will be changing to match the behavior specified by CSS in an upcoming
version. To keep the existing behavior, move the declaration above the nested
rule. To opt into the new behavior, wrap the declaration in `& {}`.
---
 src/components/storagePools/storagePoolList.scss | 12 ++++++------
 src/components/vm/vmReplaceSpiceDialog.scss      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/storagePools/storagePoolList.scss b/src/components/storagePools/storagePoolList.scss
index b901b3460..3a76aba27 100644
--- a/src/components/storagePools/storagePoolList.scss
+++ b/src/components/storagePools/storagePoolList.scss
@@ -1,4 +1,10 @@
 #storage-pools-listing {
+  // Approximate size of text
+  // (overflows work, but will knock out alignment)
+  --progress-text: 8rem;
+  --progress-bar-min: 2rem;
+  --progress-bar-max: 12vw;
+
   .pf-v5-c-table tbody > tr > * {
     // These tables are 1 row tall; progress bar does odd stuff for alignment;
     // vertical alignment makes text line up
@@ -10,12 +16,6 @@
     margin-block-start: 0;
   }
 
-  // Approximate size of text
-  // (overflows work, but will knock out alignment)
-  --progress-text: 8rem;
-  --progress-bar-min: 2rem;
-  --progress-bar-max: 12vw;
-
   td[data-label="Size"] {
     > .pf-v5-c-progress {
       // Fix progress bar size
diff --git a/src/components/vm/vmReplaceSpiceDialog.scss b/src/components/vm/vmReplaceSpiceDialog.scss
index a0e2e50e1..5fd2c0043 100644
--- a/src/components/vm/vmReplaceSpiceDialog.scss
+++ b/src/components/vm/vmReplaceSpiceDialog.scss
@@ -1,4 +1,7 @@
 .spice-replace-dialog-panel {
+    // separate it a bit from the text above
+    margin-block-start: var(--pf-v5-global--spacer--md);
+
     // drop excessive inside spacing
     .pf-v5-c-panel__main-body {
         padding-block-start: 0;
@@ -6,9 +9,6 @@
         padding-inline-start: 0;
         padding-inline-end: 0;
     }
-
-    // but separate it a bit from the text above
-    margin-block-start: var(--pf-v5-global--spacer--md);
 }
 
 .spice-replace-dialog-popover-list {