Fix loading, align generate button

magenta · Dec 7, 2021 · 976cb58 · 976cb58
1 parent 998ded6
commit 976cb58
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/client/components/main.scss b/client/components/main.scss
@@ -12,8 +12,8 @@ body {
 	background-color: var(--background-color);
 	font-family: var(--font-family);
 	font-size: var(--font-size);
-	display: flex;
 	height: 149px;
+	display: flex;
 	// border: 1px solid red;
 
 	#title {
@@ -25,11 +25,21 @@ body {
 		letter-spacing: 0.2em;
 		transition: letter-spacing 0.5s;
 		height: 16px;
-		margin: 0 auto;
-		display: inline-block;
-		left: 50%;
-		transform: translate(-50%, 0);
+		// margin: 0 auto;
+		// display: inline-block;
+		// left: 50%;
+		// transform: translate(-50%, 0);
 		cursor: default;
+		margin-bottom: 12px;
+	}
+
+	#plugin-container > div {
+		// display: block;
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		width: 720px;
+		height: 100%;
 	}
 
 	magenta-select {
@@ -121,6 +131,7 @@ nav {
 
 .plugin-content {
 	display: flex;
+	flex: 1;
 }
 
 #controls {
@@ -130,17 +141,31 @@ nav {
 .plugin-panel {
 	margin-right: 15px;
 	min-width: 180px;
+	// display: flex;
+	// flex-direction: column;
+	// justify-content: center;
+	// height: 100%;
 }
 
 .plugin-panel__type {
 	margin-right: 15px;
 	min-width: 80px;
+	// display: flex;
+	// flex-direction: column;
+	// justify-content: center;
+	// margin-top: -21px;
 }
 
 .plugin-panel__generate {
 	margin-right: 15px;
 	min-width: 200px;
 	padding: 0 10px;
+	// display: flex;
+	// flex-direction: column;
+	// justify-content: center;
+	// margin-top: -49px; // to center incl title
+	// margin-top: -28px; // to center incl title
+	margin-top: 3px;
 }
 
 

diff --git a/client/index.js b/client/index.js
@@ -40,6 +40,7 @@ document.addEventListener('DOMContentLoaded', function(){
 		window.history.pushState({}, '', '/continue')
 		render(nothing, pluginContainer)
 		Continue(pluginContainer)
+		document.body.style.display = 'flex'
 	}, 10)
 }, false)
 

diff --git a/client/interpolate/style.scss b/client/interpolate/style.scss
@@ -2,10 +2,6 @@
 
 body #interpolate {
 	--accent-color: var(--color-accent-yellow);
-	magenta-midi-file {
-		height: 150px;
-	}
-
 }
 
 #interpolate {

diff --git a/magenta4live.amxd/patchers/testing.maxpat b/magenta4live.amxd/patchers/testing.maxpat
@@ -10,8 +10,8 @@
 		}
 ,
 		"classnamespace" : "box",
-		"rect" : [ 34.0, 166.0, 930.0, 574.0 ],
-		"openrect" : [ 0.0, 0.0, 940.0, 169.0 ],
+		"rect" : [ 34.0, 164.0, 960.0, 169.0 ],
+		"openrect" : [ 0.0, 0.0, 960.0, 169.0 ],
 		"bglocked" : 0,
 		"openinpresentation" : 1,
 		"default_fontsize" : 12.0,
@@ -326,8 +326,6 @@
 					"saved_object_attributes" : 					{
 						"autostart" : 1,
 						"defer" : 0,
-						"node_bin_path" : "",
-						"npm_bin_path" : "",
 						"watch" : 0
 					}
 ,
@@ -344,7 +342,7 @@
 					"outlettype" : [ "" ],
 					"patching_rect" : [ 73.0, 142.0, 320.0, 240.0 ],
 					"presentation" : 1,
-					"presentation_rect" : [ 0.0, 0.0, 900.0, 169.0 ],
+					"presentation_rect" : [ 0.0, 0.0, 960.0, 169.0 ],
 					"rendermode" : 2,
 					"url" : "http://localhost:3333"
 				}

diff --git a/template.html b/template.html
@@ -5,6 +5,6 @@
 		<title>Magenta</title>
 
 	</head>
-	<body>
+	<body style="display: none;">
 	</body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,6 @@ @@
     		<title>Magenta</title>
     	</head>
-    	<body>
+    	<body style="display: none;">
     	</body>
     </html>