From 76dbffbaa95ce30b9e2586015bb950cea8373a4d Mon Sep 17 00:00:00 2001 From: Aimeri Baddouh Date: Fri, 26 Jul 2024 08:34:29 -0400 Subject: [PATCH 1/4] Ignore Mac paths --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b566470a..c3a5b152 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ tmp/ __pycache__/ venv/ *.pth + +# Mac stuff +.DS_store From a42e05e3026f03e86e1046fdb078c4b7387a2a87 Mon Sep 17 00:00:00 2001 From: Aimeri Baddouh Date: Fri, 26 Jul 2024 12:38:39 -0400 Subject: [PATCH 2/4] Update Mobile UI This update modifies the layout slightly to swap current_image and batch_images. This allows current_images to be rendered at the top in a single column layout. It introduces a mobile script to handle mobile interactions and detection Updates the associated scripts to handle correct sizing and eventing on mobile screens Update the css stylesheets to account for smaller screen sizes --- src/Pages/Shared/_Layout.cshtml | 1 + src/Pages/Text2Image.cshtml | 92 +- src/wwwroot/css/bootstrap-icons.css | 1556 +++++++++++++++++++++ src/wwwroot/css/genpage.css | 461 +++++- src/wwwroot/fonts/bootstrap-icons.woff | Bin 0 -> 123384 bytes src/wwwroot/fonts/bootstrap-icons.woff2 | Bin 0 -> 92064 bytes src/wwwroot/js/genpage/browsers.js | 15 +- src/wwwroot/js/genpage/generatehandler.js | 22 +- src/wwwroot/js/genpage/main.js | 35 +- src/wwwroot/js/genpage/mobile.js | 141 ++ 10 files changed, 2243 insertions(+), 80 deletions(-) create mode 100644 src/wwwroot/css/bootstrap-icons.css create mode 100644 src/wwwroot/fonts/bootstrap-icons.woff create mode 100644 src/wwwroot/fonts/bootstrap-icons.woff2 create mode 100644 src/wwwroot/js/genpage/mobile.js diff --git a/src/Pages/Shared/_Layout.cshtml b/src/Pages/Shared/_Layout.cshtml index 20576818..50d99300 100644 --- a/src/Pages/Shared/_Layout.cshtml +++ b/src/Pages/Shared/_Layout.cshtml @@ -21,6 +21,7 @@ } + @RenderSection("Header", required: false) diff --git a/src/Pages/Text2Image.cshtml b/src/Pages/Text2Image.cshtml index b3fb66b8..3fd38aea 100644 --- a/src/Pages/Text2Image.cshtml +++ b/src/Pages/Text2Image.cshtml @@ -6,6 +6,7 @@ } @section Header { + } @if (!Program.ServerSettings.IsInstalled) @@ -19,24 +20,33 @@ window.alwaysRefreshOnLoad = @alwaysRefreshOnLoad; - +
@@ -77,21 +87,6 @@
-
- -
- -
-
-
-
-
-
- - Display Advanced Options? -
-
-
⇚
@(new HtmlString(Program.VersionUpdateMessage ?? Program.ServerSettings.UI.OverrideWelcomeMessage))
@@ -119,6 +114,7 @@
+
@@ -136,9 +132,14 @@
- - - +
+ + + + +
@@ -161,6 +162,21 @@
Interrupt All Sessions
+
⇒
+
+ +
+ +
+
+
+
+
+
+ + Display Advanced Options? +
+
Quick Tools
Reset Page Layout
@@ -193,7 +209,8 @@ Model: - + +