From 83b2c6298c1b99f53b37b8192210b209b1cb0cf5 Mon Sep 17 00:00:00 2001
From: Pufferfish <puffish@puffish.net>
Date: Mon, 2 Oct 2023 17:10:55 +0200
Subject: [PATCH] Fix other buttons

---
 _sass/fabric.scss                |  9 +++++++--
 scripts/src/lib/Installer.svelte | 22 ++++++++++++++--------
 scripts/src/lib/MCUpdater.svelte |  2 +-
 scripts/src/lib/Server.svelte    |  2 +-
 scripts/src/lib/Technic.svelte   |  2 +-
 scripts/src/lib/Template.svelte  | 30 +++++++++++++++---------------
 6 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/_sass/fabric.scss b/_sass/fabric.scss
index 6e02d1bc..d1258d4e 100644
--- a/_sass/fabric.scss
+++ b/_sass/fabric.scss
@@ -61,7 +61,7 @@
 button, .button {
 	&.primary {
 		background-color: $button-color;
-		border-radius: 5px;
+		border: none;
 
 		&:hover, &:focus {
 			background-color: darken($button-color, 10%);
@@ -73,7 +73,6 @@ button, .button {
 	&.secondary {
 		background-color: transparent;
 		border: 2px solid $button-color;
-		border-radius: 7px;
 
 		&:hover, &:focus {
 			background-color: darken($button-color, 10%);
@@ -85,6 +84,7 @@ button, .button {
 		}
 	}
 
+	border-radius: 5px;
 	color: $text-color !important;
 	text-decoration: none !important;
 	padding: 5px 8px;
@@ -93,6 +93,11 @@ button, .button {
 	box-shadow: rgba(0, 0, 0, 0.15) 1.95px 1.95px 2.6px;
 }
 
+button {
+	font-size: inherit;
+	line-height: inherit;
+}
+
 .download {
 	text-align: center;
 }
diff --git a/scripts/src/lib/Installer.svelte b/scripts/src/lib/Installer.svelte
index fa9612ee..c6b710ea 100644
--- a/scripts/src/lib/Installer.svelte
+++ b/scripts/src/lib/Installer.svelte
@@ -58,20 +58,26 @@
       </p>
 
       {#if win32}
-      <a class="button" href={selectedVersion.replace('.jar', '.exe')}>
-        <DownloadIcon/> Download for Windows
-      </a>
       <p>
-        <a href={selectedVersion}>
+        <a class="button primary" href={selectedVersion.replace('.jar', '.exe')}>
+          <DownloadIcon/> Download for Windows
+        </a>
+        <br>
+        or
+        <br>
+        <a class="button secondary" href={selectedVersion}>
           Download universal jar
         </a>
       </p>
     {:else}
-      <a class="button" href={selectedVersion}>
-        <DownloadIcon/> Download installer (Universal/.JAR)
-      </a>
       <p>
-        <a href={selectedVersion.replace('.jar', '.exe')}>
+        <a class="button primary" href={selectedVersion}>
+          <DownloadIcon/> Download installer (Universal/.JAR)
+        </a>
+        <br>
+        or
+        <br>
+        <a class="button secondary" href={selectedVersion.replace('.jar', '.exe')}>
           Download for Windows
         </a>
       </p>
diff --git a/scripts/src/lib/MCUpdater.svelte b/scripts/src/lib/MCUpdater.svelte
index e0490182..aa9e2a4d 100644
--- a/scripts/src/lib/MCUpdater.svelte
+++ b/scripts/src/lib/MCUpdater.svelte
@@ -19,5 +19,5 @@
 <main>
   <LegacyVersion bind:this={legacyVersion} />
   <br />
-  <button on:click={copyImportEntry}>Copy MCUpdater Import entry</button>
+  <button class="primary" on:click={copyImportEntry}>Copy MCUpdater Import entry</button>
 </main>
diff --git a/scripts/src/lib/Server.svelte b/scripts/src/lib/Server.svelte
index 2269666a..7cb79932 100644
--- a/scripts/src/lib/Server.svelte
+++ b/scripts/src/lib/Server.svelte
@@ -67,7 +67,7 @@
     </div>
 
     <div class="download">
-      <a class="button" href={serverJarUrl}><DownloadIcon /> Executable Server (.jar)</a>
+      <a class="button primary" href={serverJarUrl}><DownloadIcon />Executable Server (.jar)</a>
     </div>
     <p>
       <a href={installerJarUrl}>
diff --git a/scripts/src/lib/Technic.svelte b/scripts/src/lib/Technic.svelte
index ada63113..f8eeab6b 100644
--- a/scripts/src/lib/Technic.svelte
+++ b/scripts/src/lib/Technic.svelte
@@ -39,5 +39,5 @@ import { getLauncherProfile } from "./Api";
 <main>
   <LegacyVersion bind:this={legacyVersion} />
   <br />
-  <button on:click={downloadJson}>Download bin/version.json file</button>
+  <button class="primary" on:click={downloadJson}>Download bin/version.json file</button>
 </main>
diff --git a/scripts/src/lib/Template.svelte b/scripts/src/lib/Template.svelte
index fb5e620e..d5e9f5d9 100644
--- a/scripts/src/lib/Template.svelte
+++ b/scripts/src/lib/Template.svelte
@@ -108,10 +108,10 @@
             {:else}
                 <p>Choose a name for your new mod. The mod ID will be <code>{modid}</code>. <a href={""} on:click|preventDefault={useCustomModId}>Use custom id</a></p>
             {/if}
-            
+
             <input id="project-name" bind:value={projectName} on:keyup={doFormatProjectName} />
-            
-            {#if modIdErrors != undefined} 
+
+            {#if modIdErrors != undefined}
             {#each modIdErrors as error}
                 <li style="color: red">{error}</li>
             {/each}
@@ -124,7 +124,7 @@
                 <h3>Mod ID:</h3>
                 <hr />
                 <p>Enter the modid you wish to use for your mod. <a href={""} on:click|preventDefault={useDefaultModId}>Use default</a></p>
-                {#if customIdErrors != undefined} 
+                {#if customIdErrors != undefined}
                     {#each customIdErrors as error}
                         <li style="color: red">{error}</li>
                     {/each}
@@ -208,12 +208,12 @@
         <br>
 
         {#if loading}
-            <a class="button download-button" href={""}>
+            <a class="button primary download-button" href={""}>
                 <DownloadIcon /> Generating...
             </a>
         {:else}
             <a
-                class="button download-button"
+                class="button primary download-button"
                 href={""}
                 on:click|preventDefault={generate}
             >
@@ -246,24 +246,24 @@
 
     .option {
         &-container {
-            display: flex; 
-            align-items: center; 
+            display: flex;
+            align-items: center;
         }
 
         &-input {
-            width: 1rem; 
-            height: 1rem; 
+            width: 1rem;
+            height: 1rem;
         }
 
         &-label {
-            margin-left: 0.5rem; 
+            margin-left: 0.5rem;
         }
 
         &-body {
-            display: block; 
-            padding-left: 1rem; 
-            margin-top: 0.25rem; 
-            margin-left: 1rem;  
+            display: block;
+            padding-left: 1rem;
+            margin-top: 0.25rem;
+            margin-left: 1rem;
         }
     }
 </style>