From fb0cab3ffb9e3df5917ecb5c0001da8650f0a4f9 Mon Sep 17 00:00:00 2001 From: Feenix <25067102+NayamAmarshe@users.noreply.github.com> Date: Tue, 15 Nov 2022 20:12:20 +0530 Subject: [PATCH] Updated styling --- renderer/components/LeftPaneSteps.tsx | 55 ++++++++++++++------------- renderer/pages/index.tsx | 2 +- renderer/styles/globals.css | 6 +-- tailwind.config.js | 8 +++- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/renderer/components/LeftPaneSteps.tsx b/renderer/components/LeftPaneSteps.tsx index 4304935..f456b72 100644 --- a/renderer/components/LeftPaneSteps.tsx +++ b/renderer/components/LeftPaneSteps.tsx @@ -33,31 +33,27 @@ function LeftPaneSteps(props) { ]; return ( -
+
+
+

Image

+ + +

Video

+
+ {/* BATCH OPTION */}
-

- Batch Upscale -

-
- - {/* ADVANCED OPTION */} -
- -

- Advanced Options -

+

Batch Upscale

+
{/* STEP 1 */} @@ -90,7 +86,6 @@ function LeftPaneSteps(props) { className="react-select-container" classNamePrefix="react-select" defaultValue={modelOptions[0]} - defaultMenuIsOpen={true} /> {props.model !== "models-DF2K" && !props.batchMode && ( @@ -115,12 +110,12 @@ function LeftPaneSteps(props) { > Double Upscayl

- - i - + i +
)} @@ -134,6 +129,17 @@ function LeftPaneSteps(props) { + {/* ADVANCED OPTION */} +
+ +

+ Advanced Options +

+
+ {/* STEP 4 */}

Step 4

@@ -145,11 +151,6 @@ function LeftPaneSteps(props) { {props.progress.length > 0 ? "Upscayling⏳" : "Upscayl"}
- - ); } diff --git a/renderer/pages/index.tsx b/renderer/pages/index.tsx index 11b9262..1fefc32 100644 --- a/renderer/pages/index.tsx +++ b/renderer/pages/index.tsx @@ -264,7 +264,7 @@ const Home = () => { return (
-
+
{((!batchMode && imagePath.length > 0) || (batchMode && batchFolderPath.length > 0)) && ( diff --git a/renderer/styles/globals.css b/renderer/styles/globals.css index ea200d8..903cbfb 100644 --- a/renderer/styles/globals.css +++ b/renderer/styles/globals.css @@ -53,7 +53,7 @@ @apply w-40; } .react-select-container .react-select__control { - @apply h-12 cursor-pointer rounded-lg !border-0 !border-none !border-transparent bg-primary shadow-none; + @apply rounded-btn h-12 cursor-pointer !border-0 !border-none !border-transparent bg-primary shadow-none; } .react-select-container .react-select__control--menu-is-open { @@ -69,11 +69,11 @@ } .react-select-container .react-select__menu { - @apply rounded-lg bg-primary p-1; + @apply rounded-lg bg-primary p-1 text-sm font-semibold uppercase; } .react-select-container .react-select__option { - @apply cursor-pointer rounded-md bg-primary text-slate-50 hover:bg-primary-focus; + @apply my-1 cursor-pointer rounded-md bg-primary text-slate-50 hover:bg-primary-focus; } .react-select-container .react-select__option--is-selected { diff --git a/tailwind.config.js b/tailwind.config.js index 4a856a7..6ef1908 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,6 +3,12 @@ module.exports = { "./renderer/pages/**/*.{js,ts,jsx,tsx}", "./renderer/components/**/*.{js,ts,jsx,tsx}", ], - theme: {}, + theme: { + extend: { + spacing: { + 128: "28rem", + }, + }, + }, plugins: [require("daisyui"), require("tailwind-scrollbar")], };