From cad946bb3b570e0623cec2771ce75b5fd397b0ed Mon Sep 17 00:00:00 2001
From: Paul Maskelyne <mu77ley@gmail.com>
Date: Wed, 25 Sep 2024 17:04:05 +0100
Subject: [PATCH] closes #489

---
 CHANGELOG.md                    |  1 +
 scss/components/_aptracker.scss |  2 +-
 scss/components/_resource.scss  | 13 ++++++++-----
 scss/global/_window.scss        |  9 +++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e739f4c..68d747ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - [#478] Merge new French, Polish and Portuguese/Brazilian translation updates from Crowdin
 - [#485] Global Die deprecated, should now be accessed as foundry.dice.terms.Die
 - [#486] Merge new Portuguese/Brazilian translation updates from Crowdin
+- [#489] Sass's behavior for declarations that appear after nested rules will be changing
 
 ---
 
diff --git a/scss/components/_aptracker.scss b/scss/components/_aptracker.scss
index 2d955b55..50f17987 100644
--- a/scss/components/_aptracker.scss
+++ b/scss/components/_aptracker.scss
@@ -12,6 +12,7 @@
 	.ap-resource {
 		position: relative;
 		padding: 10px 20px;
+		margin-bottom: 10px;
 		background-size: 100% 100%;
 		background-repeat: no-repeat;
 		//color: white;
@@ -32,7 +33,6 @@
 			color: beige;
 		}
 
-		margin-bottom: 10px;
 		&:last-child {
 			margin-bottom: 0;
 		}
diff --git a/scss/components/_resource.scss b/scss/components/_resource.scss
index ddaf2160..1cdbd917 100644
--- a/scss/components/_resource.scss
+++ b/scss/components/_resource.scss
@@ -28,23 +28,26 @@ select {
 }
 
 .toggle-label {
+	padding: 3px;
+	border: 0 solid;
+	border-radius: 4px;
+	background-color: rgba(0, 0, 0, 0.5);
+	color: cadetblue;
+
 	input[type="checkbox"] {
 		display: none;
 	}
+
 	label {
 		cursor: pointer;
 	}
 
-	padding: 3px;
-	border: 0 solid;
-	border-radius: 4px;
-	background-color: rgba(0, 0, 0, 0.5);
-	color: cadetblue;
 	&.active {
 		color: greenyellow;
 		background-color: black;
 	}
 }
+
 .wpn-tag-toggler {
 	cursor: pointer;
 	padding: 0;
diff --git a/scss/global/_window.scss b/scss/global/_window.scss
index 30d01f67..f1292834 100644
--- a/scss/global/_window.scss
+++ b/scss/global/_window.scss
@@ -208,6 +208,10 @@
 	padding: 0;
 	color: $c-font-prim;
 	background-color: $f-vault-blue;
+
+	background-size: cover;
+	background-repeat: no-repeat;
+
 	& > form {
 		padding: 8px;
 		&.character {
@@ -223,6 +227,7 @@
 			background-color: $f-valut-dark-green;
 		}
 	}
+
 	.content-link{
 		background: darken($f-vault-blue, 10%);
 		border: unset;
@@ -232,10 +237,6 @@
 
 	}
 
-	background-size: cover;
-	background-repeat: no-repeat;
-
-
 	a.inline-roll.roll {
 		background: #4c93d2;
 		padding: 1px 4px;