extra fixes to --song-player-margin

choptop84 · Apr 21, 2024 · cdd156b · cdd156b
1 parent dc2d6c8
commit cdd156b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 18 deletions.
diff --git a/editor/ColorConfig.ts b/editor/ColorConfig.ts
@@ -6881,6 +6881,7 @@ export class ColorConfig {
 			"canyon 2": `
 			:root {
 				--page-margin: #0a0000;
+				--song-player-margin: var(--page-margin);
 				--editor-background: #5a1616;
 				--hover-preview: white;
 				--playhead: rgba(247, 172, 196, 0.9);
@@ -6992,7 +6993,6 @@ export class ColorConfig {
 				--mod-primary-note-lum-scale: 0;
 				--disabled-note-primary:    #515164;
 				--disabled-note-secondary:  #2a2a3a;
-				--song-player-margin: var(--page-margin);
 			}
 
 			* {

diff --git a/player/style.ts b/player/style.ts
@@ -127,12 +127,6 @@ document.head.appendChild(HTML.style({type: "text/css"}, `
 			</svg>');
 	}
 
-	@property --song-player-margin {
-		syntax: "<color>";
-		inherits: false;
-		initial-value: ${ColorConfig.editorBackground};
-	  }
-
 	body {
 		color: ${ColorConfig.primaryText};
 		background: ${ColorConfig.songPlayerMargin};

diff --git a/website/beepbox_editor.js b/website/beepbox_editor.js
@@ -9228,6 +9228,7 @@ var beepbox = (function (exports) {
         "canyon 2": `
 			:root {
 				--page-margin: #0a0000;
+				--song-player-margin: var(--page-margin);
 				--editor-background: #5a1616;
 				--hover-preview: white;
 				--playhead: rgba(247, 172, 196, 0.9);
@@ -9339,7 +9340,6 @@ var beepbox = (function (exports) {
 				--mod-primary-note-lum-scale: 0;
 				--disabled-note-primary:    #515164;
 				--disabled-note-secondary:  #2a2a3a;
-				--song-player-margin: var(--page-margin);
 			}
 
 			* {

diff --git a/website/beepbox_editor.min.js b/website/beepbox_editor.min.js
diff --git a/website/player/beepbox_player.js b/website/player/beepbox_player.js
@@ -8877,6 +8877,7 @@ var beepbox = (function (exports) {
         "canyon 2": `
 			:root {
 				--page-margin: #0a0000;
+				--song-player-margin: var(--page-margin);
 				--editor-background: #5a1616;
 				--hover-preview: white;
 				--playhead: rgba(247, 172, 196, 0.9);
@@ -8988,7 +8989,6 @@ var beepbox = (function (exports) {
 				--mod-primary-note-lum-scale: 0;
 				--disabled-note-primary:    #515164;
 				--disabled-note-secondary:  #2a2a3a;
-				--song-player-margin: var(--page-margin);
 			}
 
 			* {
@@ -29122,12 +29122,6 @@ var beepbox = (function (exports) {
 			</svg>');
 	}
 
-	@property --song-player-margin {
-		syntax: "<color>";
-		inherits: false;
-		initial-value: ${ColorConfig.editorBackground};
-	  }
-
 	body {
 		color: ${ColorConfig.primaryText};
 		background: ${ColorConfig.songPlayerMargin};

diff --git a/website/player/beepbox_player.min.js b/website/player/beepbox_player.min.js
diff --git a/website/player/index.html b/website/player/index.html
@@ -25,7 +25,8 @@
 			display: flex;
 			margin: 0;
 			padding: 0;
-			background: var(--page-margin, black);
+			background: var(--editor-background, --page-margin, black);
+
 		}
 		body {
 			width: 100vw;