finished theme stuff

JiayiSoftware · Jul 7, 2023 · 4505852 · 4505852
1 parent be5172f
commit 4505852
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 9 deletions.
diff --git a/JiayiLauncher/Pages/Dashboard.razor.css b/JiayiLauncher/Pages/Dashboard.razor.css
@@ -20,6 +20,9 @@
     width: fit-content;
     max-width: 45vw;
     padding: 0.7rem;
+
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-primary);
 }
 
 .card p {

diff --git a/JiayiLauncher/Pages/Extra/Shaders.razor.css b/JiayiLauncher/Pages/Extra/Shaders.razor.css
@@ -24,6 +24,9 @@
     align-items: center;
 
     transition: var(--transition-speed);
+
+    border-top-left-radius: var(--rounding);
+    border-top-right-radius: var(--rounding);
 }
 
 .shader-list-toggle:hover {
@@ -53,6 +56,11 @@
     position: relative;
 }
 
+.shader:last-child {
+    border-bottom-left-radius: var(--rounding);
+    border-bottom-right-radius: var(--rounding);
+}
+
 .shader-controls {
     display: flex;
     column-gap: 0.5rem;
@@ -80,6 +88,7 @@
 
 .add-new {
     border: 2px dashed var(--text-grayed);
+    border-radius: var(--rounding);
     text-align: center;
     padding: 0.5rem;
     color: var(--text-grayed);

diff --git a/JiayiLauncher/Pages/Mods.razor.css b/JiayiLauncher/Pages/Mods.razor.css
@@ -100,8 +100,10 @@
     color: var(--text-accent);
     box-shadow: var(--shadow);
     filter: brightness(1);
-    border: none;
     transition: var(--transition-speed);
+
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-accent);
 }
 
 .add-button:hover {

diff --git a/JiayiLauncher/Pages/Settings.razor.css b/JiayiLauncher/Pages/Settings.razor.css
@@ -38,7 +38,6 @@
 
 .tab-button {
     background-color: var(--background-secondary);
-    border: none;
     color: var(--text-primary);
     padding: 0.5rem;
     text-align: center;
@@ -53,6 +52,9 @@
     cursor: pointer;
 
     transition: var(--transition-speed);
+
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-primary);
 }
 
 .tab-button:hover {

diff --git a/JiayiLauncher/Pages/Versions.razor.css b/JiayiLauncher/Pages/Versions.razor.css
@@ -39,6 +39,9 @@
     width: fit-content;
     max-width: 45vw;
     padding: 0.7rem;
+
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-primary);
 }
 
 .shader-card {

diff --git a/JiayiLauncher/Shared/Components/JiayiButton.razor.css b/JiayiLauncher/Shared/Components/JiayiButton.razor.css
@@ -1,6 +1,5 @@
 .button {
     background-color: var(--accent);
-    border: none;
     color: var(--text-accent);
     filter: brightness(1) grayscale(0);
     padding: 1rem 1.5rem;
@@ -15,6 +14,9 @@
     box-shadow: var(--shadow);
 
     cursor: pointer;
+
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-accent);
 
     transition: var(--transition-speed);
 }

diff --git a/JiayiLauncher/Shared/Components/JiayiColorPicker.razor.css b/JiayiLauncher/Shared/Components/JiayiColorPicker.razor.css
@@ -13,6 +13,7 @@
     box-shadow: var(--shadow);
     filter: brightness(1);
     border: 2px solid rgba(0, 0, 0, 0.4);
+    border-radius: var(--rounding);
 
     transition-duration: var(--transition-speed);
 }

diff --git a/JiayiLauncher/Shared/Components/JiayiDropDown.razor.css b/JiayiLauncher/Shared/Components/JiayiDropDown.razor.css
@@ -13,6 +13,9 @@
     transition: var(--transition-speed);
 
     filter: brightness(1);
+
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-primary);
 
     z-index: 2; /* Dropdown behind other elements when opened if removed */
 }

diff --git a/JiayiLauncher/Shared/Components/JiayiTextBox.razor.css b/JiayiLauncher/Shared/Components/JiayiTextBox.razor.css
@@ -1,13 +1,15 @@
 .textbox {
     background-color: var(--background-secondary);
-    border: var(--accent) 0 solid;
     color: var(--text-primary);
     padding: 0.5rem 1rem;
     font-family: Montserrat, sans-serif;
     font-size: 16px;
     transition-duration: calc(var(--transition-speed) / 2);
     box-shadow: var(--shadow);
     filter: brightness(1);
+
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-primary);
 }
 
 .textbox:hover {

diff --git a/JiayiLauncher/Shared/Components/JiayiToggle.razor b/JiayiLauncher/Shared/Components/JiayiToggle.razor
@@ -1,4 +1,4 @@
-<label class="toggle">
+<label class="toggle" style="border-color: @_borderColor">
     <input type="checkbox" checked="@Checked" @onchange="Changed">
     <span class="toggle-box"></span>
 
@@ -14,6 +14,7 @@
     public EventCallback<bool> CheckedChanged { get; set; }
 
     private string _onColor => Checked ? "var(--text-accent)" : "var(--text-primary)";
+    private string _borderColor => Checked ? "var(--border-accent)" : "var(--border-primary)";
 
     private void Changed(ChangeEventArgs obj)
     {

diff --git a/JiayiLauncher/Shared/Components/JiayiToggle.razor.css b/JiayiLauncher/Shared/Components/JiayiToggle.razor.css
@@ -15,6 +15,9 @@
     filter: brightness(1);
     cursor: pointer;
 
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-primary);
+
     transition: var(--transition-speed);
 }
 

diff --git a/JiayiLauncher/Shared/Components/Mods/JiayiFilter.razor b/JiayiLauncher/Shared/Components/Mods/JiayiFilter.razor
@@ -16,7 +16,7 @@
     [Parameter]
     public EventCallback Changed { get; set; }
 
-    private string _color => Checked ? "background-color: var(--accent); color: var(--text-accent)" 
+    private string _color => Checked ? "background-color: var(--accent); color: var(--text-accent); border-color: var(--border-accent)" 
         : "background-color: var(--background-secondary); color: var(--text-primary)";
 
     private void OnChange(ChangeEventArgs e)

diff --git a/JiayiLauncher/Shared/Components/Mods/JiayiFilter.razor.css b/JiayiLauncher/Shared/Components/Mods/JiayiFilter.razor.css
@@ -5,6 +5,8 @@
     box-shadow: var(--shadow);
     cursor: pointer;
     transition-duration: var(--transition-speed);
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-primary);
 }
 
 .check {

diff --git a/JiayiLauncher/Shared/Components/Mods/JiayiModCard.razor.css b/JiayiLauncher/Shared/Components/Mods/JiayiModCard.razor.css
@@ -1,10 +1,12 @@
 .mod-background {
     background-color: var(--background-secondary);
     box-shadow: var(--shadow);
-    border-top: 5px solid var(--accent);
     width: 11.5rem;
     padding: 0.5rem;
     transition: var(--transition-speed);
+    border-radius: var(--rounding);
+    border: var(--border-thickness) solid var(--border-primary);
+    border-top: 5px solid var(--accent);
 }
 
 .mod-controls {

diff --git a/JiayiLauncher/Shared/Components/Toasts/JiayiToast.razor.css b/JiayiLauncher/Shared/Components/Toasts/JiayiToast.razor.css
@@ -1,8 +1,9 @@
 .toast {
     padding: 1rem;
     background-color: var(--background-secondary);
-    border-radius: 0;
+    border-radius: var(--rounding);
     color: var(--text-primary);
+    border: var(--border-thickness) solid var(--border-primary);
 }
 
 .toast-header {

diff --git a/JiayiLauncher/Shared/Sidebar.razor.css b/JiayiLauncher/Shared/Sidebar.razor.css
@@ -7,6 +7,8 @@
     transition: width var(--transition-speed) ease;
     z-index: 5;
     box-shadow: 5px 0 rgba(0, 0, 0, 0.4);
+    border-top-right-radius: var(--rounding);
+    border-bottom-right-radius: var(--rounding);
 }
 
 .sidebar-items {

diff --git a/JiayiLauncher/wwwroot/css/app.css b/JiayiLauncher/wwwroot/css/app.css
@@ -79,7 +79,6 @@ main {
 /* dumb stupid hacks to get modals to look right */
 
 .modal {
-    border-radius: 0;
     background-color: var(--background-primary);
     color: var(--text-primary);
     width: fit-content;
@@ -93,6 +92,8 @@ main {
 
     transition: var(--transition-speed);
     animation: modal-enter var(--transition-speed) ease;
+
+    border-radius: var(--rounding);
 }
 
 .fade-in {