From aaa8b38f6b27044207ad129e662a224d3199768b Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 15 Nov 2023 17:27:04 +0100 Subject: [PATCH] Switch to bootstrap for styling --- pom.xml | 7 ++ .../resources/css/customer/edit-style.css | 21 ----- .../static/resources/css/customer/style.css | 64 --------------- .../static/resources/css/profile/style.css | 57 ------------- .../static/resources/css/staff/edit-style.css | 21 ----- .../static/resources/css/staff/style.css | 70 ---------------- .../resources/static/resources/css/style.css | 21 ++--- src/main/resources/templates/catalog.html | 20 ++--- .../resources/templates/catalog_editor.html | 39 +++++---- src/main/resources/templates/customers.html | 13 ++- .../resources/templates/edit-customer.html | 30 +++---- src/main/resources/templates/edit-staff.html | 41 +++++----- src/main/resources/templates/event.html | 41 +++++----- .../resources/templates/inventory-mutate.html | 46 +++++------ src/main/resources/templates/inventory.html | 21 ++--- src/main/resources/templates/layout.html | 30 +++---- src/main/resources/templates/login.html | 80 ++++--------------- src/main/resources/templates/navigation.html | 61 ++++++++++---- src/main/resources/templates/orders.html | 18 ++--- .../resources/templates/orders_calender.html | 22 +---- src/main/resources/templates/profile.html | 61 +++++++------- src/main/resources/templates/register.html | 45 +++-------- src/main/resources/templates/staff.html | 42 +++++----- src/main/resources/templates/welcome.html | 11 +-- 24 files changed, 287 insertions(+), 595 deletions(-) delete mode 100644 src/main/resources/static/resources/css/customer/edit-style.css delete mode 100644 src/main/resources/static/resources/css/customer/style.css delete mode 100644 src/main/resources/static/resources/css/profile/style.css delete mode 100644 src/main/resources/static/resources/css/staff/edit-style.css delete mode 100644 src/main/resources/static/resources/css/staff/style.css diff --git a/pom.xml b/pom.xml index 2446177..735f82b 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,13 @@ Use Maven Central for package search (https://search.maven.org/). --> + + org.webjars + bootstrap + 5.3.2 + runtime + + diff --git a/src/main/resources/static/resources/css/customer/edit-style.css b/src/main/resources/static/resources/css/customer/edit-style.css deleted file mode 100644 index f102890..0000000 --- a/src/main/resources/static/resources/css/customer/edit-style.css +++ /dev/null @@ -1,21 +0,0 @@ -body { - font: 13px/22px Helvetica, Arial, sans-serif; - background: #f0f0f0; -} - -h2 { - text-decoration: underline; -} - -.button { - cursor: pointer; - font-size: 13px; - text-decoration: none; - background-color: #EEEEEE; - color: #333333; - padding: 2px 6px 2px 6px; - border-top: 1px solid #333333; - border-right: 1px solid #333333; - border-bottom: 1px solid #333333; - border-left: 1px solid #333333; -} diff --git a/src/main/resources/static/resources/css/customer/style.css b/src/main/resources/static/resources/css/customer/style.css deleted file mode 100644 index 9aeb7b4..0000000 --- a/src/main/resources/static/resources/css/customer/style.css +++ /dev/null @@ -1,64 +0,0 @@ -/* CSS RESET */ - -body { - margin: 0 auto; - width: 940px; - font: 13px/22px Helvetica, Arial, sans-serif; - background: #f0f0f0; -} - -h1 { - font-size: 3em; - line-height: 3.2em; - text-align:center; -} - -table { - border-collapse: collapse; - width: 95%; - margin-top: 20px; - -} -th, -td { - border: 1px solid #dddddd; - text-align: left; - padding: 8px; -} -th { - background-color: #f2f2f2; - text-decoration: underline; - font-size: 19px; -} -tr{ - font-size: 17px; -} - -td:last-child, -td:nth-child(5) { - width: 50px; - text-align: center; -} -tr:nth-child(even) { - background-color: rgb(214, 236, 216); -} - -button { - cursor: pointer; - font-size: 13px; - margin-left: 4px; - margin-right: 4px; -} - -.button { - cursor: pointer; - font-size: 13px; - text-decoration: none; - background-color: #EEEEEE; - color: #333333; - padding: 2px 6px 2px 6px; - border-top: 1px solid #333333; - border-right: 1px solid #333333; - border-bottom: 1px solid #333333; - border-left: 1px solid #333333; -} diff --git a/src/main/resources/static/resources/css/profile/style.css b/src/main/resources/static/resources/css/profile/style.css deleted file mode 100644 index 42f0afe..0000000 --- a/src/main/resources/static/resources/css/profile/style.css +++ /dev/null @@ -1,57 +0,0 @@ -/* CSS RESET */ - -* { - margin: 0; - padding: 0; -} - -body { - margin: 0 auto; - width: 940px; - font: 13px/22px Helvetica, Arial, sans-serif; - background: #f0f0f0; -} - -h1 { - font-size: 3em; - line-height: 3.2em; - text-align:center; -} - -table { - border-collapse: separate; - border-spacing: 5 2em; - padding: 20px; - padding-left: 50px; - font-size: 20px; -} - -h2 { - margin: 10px; -} - -th, td { - padding: 15px; -} - -.horizontal_center { - display: flex; - justify-content: center; - align-items: center; -} - -div.danger_zone { - margin-bottom: 50px; -} - -button.danger_zone { - padding-top: 15px; - padding-bottom: 15px; - padding-right: 25px; - padding-left: 25px; - margin-left: 40px; - margin-right: 40px; - color: red; - border: 2px solid red; - border-radius: 4px; -} diff --git a/src/main/resources/static/resources/css/staff/edit-style.css b/src/main/resources/static/resources/css/staff/edit-style.css deleted file mode 100644 index f102890..0000000 --- a/src/main/resources/static/resources/css/staff/edit-style.css +++ /dev/null @@ -1,21 +0,0 @@ -body { - font: 13px/22px Helvetica, Arial, sans-serif; - background: #f0f0f0; -} - -h2 { - text-decoration: underline; -} - -.button { - cursor: pointer; - font-size: 13px; - text-decoration: none; - background-color: #EEEEEE; - color: #333333; - padding: 2px 6px 2px 6px; - border-top: 1px solid #333333; - border-right: 1px solid #333333; - border-bottom: 1px solid #333333; - border-left: 1px solid #333333; -} diff --git a/src/main/resources/static/resources/css/staff/style.css b/src/main/resources/static/resources/css/staff/style.css deleted file mode 100644 index faba771..0000000 --- a/src/main/resources/static/resources/css/staff/style.css +++ /dev/null @@ -1,70 +0,0 @@ -/* CSS RESET */ - -body { - margin: 0 auto; - width: 940px; - font: 13px/22px Helvetica, Arial, sans-serif; - background: #f0f0f0; -} - -h1 { - font-size: 3em; - line-height: 3.2em; - text-align:center; -} - -h2 { - text-decoration: underline; -} - -table { - border-collapse: collapse; - width: 95%; - margin-top: 20px; -} -th, -td { - border: 1px solid #dddddd; - text-align: left; - padding: 8px; -} -th { - background-color: #f2f2f2; - text-decoration: underline; - font-size: 19px; -} -tr { - font-size: 17px; -} - -td:last-child, -td:nth-child(5) { - width: 50px; - text-align: center; -} -tr:nth-child(even) { - background-color: rgb(214, 236, 216); -} -.add-button { - margin-top: 20px; - font-size: 16px; -} -button { - cursor: pointer; - font-size: 13px; - margin-left: 4px; - margin-right: 4px; -} - -.button { - cursor: pointer; - font-size: 13px; - text-decoration: none; - background-color: #EEEEEE; - color: #333333; - padding: 2px 6px 2px 6px; - border-top: 1px solid #333333; - border-right: 1px solid #333333; - border-bottom: 1px solid #333333; - border-left: 1px solid #333333; -} diff --git a/src/main/resources/static/resources/css/style.css b/src/main/resources/static/resources/css/style.css index ed03f7e..3e93e1d 100644 --- a/src/main/resources/static/resources/css/style.css +++ b/src/main/resources/static/resources/css/style.css @@ -1,19 +1,14 @@ -/* CSS RESET */ +/* specific to login */ -* { - margin: 0; - padding: 0; +.login-container { + max-width: 24rem; } -body { - margin: 0 auto; - width: 940px; - font: 13px/22px Helvetica, Arial, sans-serif; - background: #f0f0f0; +.calendar { + border-collapse: separate; } -h1 { - font-size: 3em; - line-height: 3.2em; - text-align:center; +.calendar th, +.calendar td { + font-weight: bold; } diff --git a/src/main/resources/templates/catalog.html b/src/main/resources/templates/catalog.html index b7613b6..a75b70c 100644 --- a/src/main/resources/templates/catalog.html +++ b/src/main/resources/templates/catalog.html @@ -4,25 +4,25 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout.html(title='Katalog')}"> - -
+
- - +
+ + @@ -40,10 +40,10 @@
-
- - + + +
- + diff --git a/src/main/resources/templates/catalog_editor.html b/src/main/resources/templates/catalog_editor.html index a210146..ae53931 100644 --- a/src/main/resources/templates/catalog_editor.html +++ b/src/main/resources/templates/catalog_editor.html @@ -5,32 +5,32 @@ layout:decorate="~{layout.html(title='Katalog bearbeiten')}"> -
+

Dienstleistung

- +
- - + Eventbasispreis: 500€

Mindestzeitraum

- + - - + +

Basisausstattung

-
Name Mindestzeitraum Basisausstattung Preis ab
**BILD** - h +
  • @@ -32,7 +32,7 @@
- +
+
@@ -42,21 +42,20 @@ +
Produktname Menge
- - + +
-
-
- - - - + + + + - -
hinzufügen + +

Momentane Auswahl

Eventtyp:
@@ -67,9 +66,9 @@ - +
-
+ diff --git a/src/main/resources/templates/customers.html b/src/main/resources/templates/customers.html index 7b313b2..f813f01 100644 --- a/src/main/resources/templates/customers.html +++ b/src/main/resources/templates/customers.html @@ -4,14 +4,13 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout.html(title='Kunden')}"> - -
-
+
+

Kundenverwaltung

- +
@@ -21,15 +20,15 @@ - +
Nutzername Aufträge
Musterkoch AufträgeBearbeiten - Entfernen + Deaktiviert
-
+ diff --git a/src/main/resources/templates/edit-customer.html b/src/main/resources/templates/edit-customer.html index edc0ca6..3e8b1c9 100644 --- a/src/main/resources/templates/edit-customer.html +++ b/src/main/resources/templates/edit-customer.html @@ -5,24 +5,20 @@ layout:decorate="~{layout.html(title='Kunden bearbeiten')}"> Kunde Bearbeiten - - -
-
-

Kunde Bearbeiten

-
-

Nutzername

- -

Addresse

- - -
-
-
+
+
+
+ + +
+
+ + +
+ +
+
diff --git a/src/main/resources/templates/edit-staff.html b/src/main/resources/templates/edit-staff.html index 319c272..e4be582 100644 --- a/src/main/resources/templates/edit-staff.html +++ b/src/main/resources/templates/edit-staff.html @@ -5,29 +5,26 @@ layout:decorate="~{layout.html(title='Personal bearbeiten')}"> Personal Bearbeiten - - -
-
-

Personal Bearbeiten

-
- - - - - - - - - - - - -
- Cancel -
-
+
+
+ +
+ + +
+
+ + +
+
+ + +
+ + +
+
diff --git a/src/main/resources/templates/event.html b/src/main/resources/templates/event.html index c45a869..e9c8c64 100644 --- a/src/main/resources/templates/event.html +++ b/src/main/resources/templates/event.html @@ -5,21 +5,21 @@ layout:decorate="~{layout.html(title='Event konfigurieren')}"> -
+
-
- +
@@ -32,25 +32,24 @@

Product hinzufügen

- -
- - -
+
+ +
+ + +
-
- - -
+
+ + +
- - - -
-
- +
- - + +
+ + +
diff --git a/src/main/resources/templates/inventory-mutate.html b/src/main/resources/templates/inventory-mutate.html index 0d07eba..79f5f35 100644 --- a/src/main/resources/templates/inventory-mutate.html +++ b/src/main/resources/templates/inventory-mutate.html @@ -4,40 +4,40 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout.html(title='Lagerverwaltung')}"> -
+

-
- - +
+ +
+ +
-
- - +
+ +
-
- - +
+ +
-
- - +
+ +
-
- - +
+ +
-
+
- - -
-
- + +
+ -
+ diff --git a/src/main/resources/templates/inventory.html b/src/main/resources/templates/inventory.html index b82dbdc..826eb26 100644 --- a/src/main/resources/templates/inventory.html +++ b/src/main/resources/templates/inventory.html @@ -4,8 +4,8 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout.html(title='Inventar')}"> -
-
Produkt Anzahl
+
+
@@ -27,19 +27,14 @@ - - - - - - - - - - +
+ + +
-
+ + diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html index 09930b8..0175ef1 100644 --- a/src/main/resources/templates/layout.html +++ b/src/main/resources/templates/layout.html @@ -5,26 +5,26 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> + + - - - Catering -
-
-

Catering

-
- -
+ +
+

+
+
+
+
- + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 43841dd..3ed33bd 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -4,70 +4,20 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout.html(title='Login')}"> - - - - -
-
- -
- - - - - -
- -
- - - - - -
- -
- - - -
- -
- +
+

Haben Sie noch keinen Account? Registrieren Sie sich hier.

-
- +
diff --git a/src/main/resources/templates/navigation.html b/src/main/resources/templates/navigation.html index 309759b..5e9370f 100644 --- a/src/main/resources/templates/navigation.html +++ b/src/main/resources/templates/navigation.html @@ -4,25 +4,52 @@ -