diff --git a/static/output.css b/static/output.css index 9089e2d..7f2efac 100644 --- a/static/output.css +++ b/static/output.css @@ -583,22 +583,18 @@ video { right: 0px; } +.col-span-1 { + grid-column: span 1 / span 1; +} + .col-span-12 { grid-column: span 12 / span 12; } -.col-span-2 { - grid-column: span 2 / span 2; -} - .col-span-3 { grid-column: span 3 / span 3; } -.col-span-1 { - grid-column: span 1 / span 1; -} - .col-span-7 { grid-column: span 7 / span 7; } @@ -615,10 +611,6 @@ video { margin: 1rem; } -.m-8 { - margin: 2rem; -} - .-mx-2 { margin-left: -0.5rem; margin-right: -0.5rem; @@ -770,6 +762,10 @@ video { width: 3rem; } +.w-16 { + width: 4rem; +} + .w-4 { width: 1rem; } @@ -786,10 +782,6 @@ video { width: 100%; } -.w-16 { - width: 4rem; -} - .min-w-full { min-width: 100%; } @@ -854,10 +846,6 @@ video { grid-template-columns: repeat(2, minmax(0, 1fr)); } -.grid-cols-3 { - grid-template-columns: repeat(3, minmax(0, 1fr)); -} - .grid-cols-4 { grid-template-columns: repeat(4, minmax(0, 1fr)); } @@ -866,10 +854,6 @@ video { grid-template-columns: repeat(6, minmax(0, 1fr)); } -.grid-cols-8 { - grid-template-columns: repeat(8, minmax(0, 1fr)); -} - .flex-col { flex-direction: column; } @@ -919,6 +903,12 @@ video { row-gap: 1rem; } +.space-x-2 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(0.5rem * var(--tw-space-x-reverse)); + margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse))); +} + .space-x-4 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(1rem * var(--tw-space-x-reverse)); @@ -949,12 +939,6 @@ video { margin-bottom: calc(1.5rem * var(--tw-space-y-reverse)); } -.space-x-2 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(0.5rem * var(--tw-space-x-reverse)); - margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse))); -} - .divide-y > :not([hidden]) ~ :not([hidden]) { --tw-divide-y-reverse: 0; border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); @@ -983,10 +967,6 @@ video { word-break: normal; } -.break-words { - overflow-wrap: break-word; -} - .rounded { border-radius: 0.25rem; } @@ -1141,6 +1121,11 @@ video { background-color: rgb(220 252 231 / var(--tw-bg-opacity, 1)); } +.bg-green-50 { + --tw-bg-opacity: 1; + background-color: rgb(240 253 244 / var(--tw-bg-opacity, 1)); +} + .bg-green-500 { --tw-bg-opacity: 1; background-color: rgb(34 197 94 / var(--tw-bg-opacity, 1)); @@ -1231,6 +1216,11 @@ video { background-color: rgb(254 226 226 / var(--tw-bg-opacity, 1)); } +.bg-red-50 { + --tw-bg-opacity: 1; + background-color: rgb(254 242 242 / var(--tw-bg-opacity, 1)); +} + .bg-red-500 { --tw-bg-opacity: 1; background-color: rgb(239 68 68 / var(--tw-bg-opacity, 1)); @@ -1331,16 +1321,6 @@ video { background-color: rgb(24 24 27 / var(--tw-bg-opacity, 1)); } -.bg-green-50 { - --tw-bg-opacity: 1; - background-color: rgb(240 253 244 / var(--tw-bg-opacity, 1)); -} - -.bg-red-50 { - --tw-bg-opacity: 1; - background-color: rgb(254 242 242 / var(--tw-bg-opacity, 1)); -} - .fill-red-50 { fill: #fef2f2; } @@ -1405,6 +1385,11 @@ video { padding-bottom: 0.125rem; } +.py-1 { + padding-top: 0.25rem; + padding-bottom: 0.25rem; +} + .py-1\.5 { padding-top: 0.375rem; padding-bottom: 0.375rem; @@ -1450,11 +1435,6 @@ video { padding-bottom: 2rem; } -.py-1 { - padding-top: 0.25rem; - padding-bottom: 0.25rem; -} - .pb-3 { padding-bottom: 0.75rem; } @@ -1689,6 +1669,11 @@ video { color: rgb(34 197 94 / var(--tw-text-opacity, 1)); } +.text-green-700 { + --tw-text-opacity: 1; + color: rgb(21 128 61 / var(--tw-text-opacity, 1)); +} + .text-green-800 { --tw-text-opacity: 1; color: rgb(22 101 52 / var(--tw-text-opacity, 1)); @@ -1864,11 +1849,6 @@ video { color: rgb(39 39 42 / var(--tw-text-opacity, 1)); } -.text-green-700 { - --tw-text-opacity: 1; - color: rgb(21 128 61 / var(--tw-text-opacity, 1)); -} - .antialiased { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -2228,14 +2208,6 @@ video { } @media (min-width: 768px) { - .md\:block { - display: block; - } - - .md\:grid { - display: grid; - } - .md\:flex-1 { flex: 1 1 0%; } @@ -2244,10 +2216,6 @@ video { grid-template-columns: repeat(2, minmax(0, 1fr)); } - .md\:grid-cols-8 { - grid-template-columns: repeat(8, minmax(0, 1fr)); - } - .md\:flex-row { flex-direction: row; } @@ -2339,129 +2307,3 @@ video { padding-right: 0px; } } - -@media (prefers-color-scheme: dark) { - .dark\:hidden { - display: none; - } - - .dark\:divide-gray-800 > :not([hidden]) ~ :not([hidden]) { - --tw-divide-opacity: 1; - border-color: rgb(31 41 55 / var(--tw-divide-opacity, 1)); - } - - .dark\:divide-neutral-700 > :not([hidden]) ~ :not([hidden]) { - --tw-divide-opacity: 1; - border-color: rgb(64 64 64 / var(--tw-divide-opacity, 1)); - } - - .dark\:border-gray-600 { - --tw-border-opacity: 1; - border-color: rgb(75 85 99 / var(--tw-border-opacity, 1)); - } - - .dark\:border-gray-700 { - --tw-border-opacity: 1; - border-color: rgb(55 65 81 / var(--tw-border-opacity, 1)); - } - - .dark\:border-gray-800 { - --tw-border-opacity: 1; - border-color: rgb(31 41 55 / var(--tw-border-opacity, 1)); - } - - .dark\:bg-gray-600 { - --tw-bg-opacity: 1; - background-color: rgb(75 85 99 / var(--tw-bg-opacity, 1)); - } - - .dark\:bg-gray-700 { - --tw-bg-opacity: 1; - background-color: rgb(55 65 81 / var(--tw-bg-opacity, 1)); - } - - .dark\:bg-gray-800 { - --tw-bg-opacity: 1; - background-color: rgb(31 41 55 / var(--tw-bg-opacity, 1)); - } - - .dark\:bg-gray-900 { - --tw-bg-opacity: 1; - background-color: rgb(17 24 39 / var(--tw-bg-opacity, 1)); - } - - .dark\:bg-red-600 { - --tw-bg-opacity: 1; - background-color: rgb(220 38 38 / var(--tw-bg-opacity, 1)); - } - - .dark\:text-gray-300 { - --tw-text-opacity: 1; - color: rgb(209 213 219 / var(--tw-text-opacity, 1)); - } - - .dark\:text-gray-400 { - --tw-text-opacity: 1; - color: rgb(156 163 175 / var(--tw-text-opacity, 1)); - } - - .dark\:text-gray-900 { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity, 1)); - } - - .dark\:text-neutral-200 { - --tw-text-opacity: 1; - color: rgb(229 229 229 / var(--tw-text-opacity, 1)); - } - - .dark\:text-neutral-500 { - --tw-text-opacity: 1; - color: rgb(115 115 115 / var(--tw-text-opacity, 1)); - } - - .dark\:text-white { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity, 1)); - } - - .dark\:placeholder-gray-400::-moz-placeholder { - --tw-placeholder-opacity: 1; - color: rgb(156 163 175 / var(--tw-placeholder-opacity, 1)); - } - - .dark\:placeholder-gray-400::placeholder { - --tw-placeholder-opacity: 1; - color: rgb(156 163 175 / var(--tw-placeholder-opacity, 1)); - } - - .dark\:hover\:bg-gray-600:hover { - --tw-bg-opacity: 1; - background-color: rgb(75 85 99 / var(--tw-bg-opacity, 1)); - } - - .dark\:hover\:bg-gray-700:hover { - --tw-bg-opacity: 1; - background-color: rgb(55 65 81 / var(--tw-bg-opacity, 1)); - } - - .dark\:hover\:text-white:hover { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity, 1)); - } - - .dark\:focus\:border-blue-500:focus { - --tw-border-opacity: 1; - border-color: rgb(59 130 246 / var(--tw-border-opacity, 1)); - } - - .dark\:focus\:ring-blue-500:focus { - --tw-ring-opacity: 1; - --tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity, 1)); - } - - .dark\:focus\:ring-gray-700:focus { - --tw-ring-opacity: 1; - --tw-ring-color: rgb(55 65 81 / var(--tw-ring-opacity, 1)); - } -} diff --git a/views/additem.html b/views/additem.html index 767f4c8..b08a11d 100644 --- a/views/additem.html +++ b/views/additem.html @@ -25,7 +25,7 @@
- +
@@ -127,7 +127,7 @@ - diff --git a/views/cart.html b/views/cart.html index aeaa5cf..226dbeb 100644 --- a/views/cart.html +++ b/views/cart.html @@ -62,7 +62,7 @@

Select shipping method

- {{ range .data.shipping }} diff --git a/views/checkout.html b/views/checkout.html index b81a95f..984358e 100644 --- a/views/checkout.html +++ b/views/checkout.html @@ -70,7 +70,7 @@
- +

diff --git a/views/edititem.html b/views/edititem.html index d12cdd7..aceb630 100644 --- a/views/edititem.html +++ b/views/edititem.html @@ -62,14 +62,14 @@

- +
- diff --git a/views/invoice.html b/views/invoice.html index 7a057b3..2bd7153 100644 --- a/views/invoice.html +++ b/views/invoice.html @@ -1,31 +1,31 @@
- +
- - - - - + + + + + - + {{ range .PrintJobs }} - - - - - + + {{ end }} - - - - - + + + +
NamePaperAmountPriceNamePaperAmountPrice
+ - imac image + imac image +

{{ .ShopItem.Name }}

{{ .Variant.Name }}

+

{{ .PaperType.Brand }} - {{.PaperType.Name }}: {{ .PaperType.Size }} {{ .PaperType.Weight }}g

{{ if .CoverPaperType }} @@ -33,20 +33,20 @@ {{ end }}
{{ .Amount }}{{ .PriceTotal }}{{ .Amount }}{{ .PriceTotal }}
+ TOTAL {{ .PriceTotal }}{{ .PriceTotal }}
diff --git a/views/order.html b/views/order.html index a288d70..98e7d5d 100644 --- a/views/order.html +++ b/views/order.html @@ -1,27 +1,27 @@ {{ template "header.html" . }} -
+
-

Order summary

-
+

Order summary

+
Thanks for your order! As soon as your payment arrived we will print your Order.
-
-

Order status: {{ .data.order.Status }}

+
+

Order status: {{ .data.order.Status }}

-
+
Order Code: {{ .data.order.Token }}
-
-

Payment information

+
+

Payment information

-
+
Either you transfer money to our bank account, or you come by and pay in cash.

Miteinander Dresden e.V.*
@@ -33,11 +33,11 @@
-
-

Delivery information

+
+

Delivery information

-
+

Shipping: {{ .data.shipping.Name }}

{{ if .data.askAddress }}

First Name: {{ .data.order.FirstName }}

@@ -54,21 +54,21 @@
-
- - +
+
+ {{ range .data.order.CartItems }} - - + + {{ end }} @@ -81,20 +81,20 @@
-
Original price
-
{{ .data.priceProducts }}€
+
Original price
+
{{ .data.priceProducts }}€
-
Shipping
-
{{ .data.shipping.Price }}€
+
Shipping
+
{{ .data.shipping.Price }}€
-
-
Total
-
{{ .data.priceTotal }}€
+
+
Total
+
{{ .data.priceTotal }}€
diff --git a/views/orderpreview.html b/views/orderpreview.html index 3b920d8..bea210e 100644 --- a/views/orderpreview.html +++ b/views/orderpreview.html @@ -1,16 +1,16 @@ {{ template "header.html" . }} -
+
-

Order summary

+

Order summary

-
-

Delivery information

+
+

Delivery information

-
+

Shipping: {{ .data.shipping.Name }}

{{ if .data.askAddress }}

First Name: {{ .data.order.FirstName }}

@@ -25,25 +25,25 @@
- Edit + Edit
-
-
x{{ .Quantity }}{{ .ItemVariant.Price }}€x{{ .Quantity }}{{ .ItemVariant.Price }}€
- +
+
+ {{ range .data.order.CartItems }} - - + + {{ end }} @@ -52,32 +52,32 @@
-

Order summary

+

Order summary

-
Original price
-
{{ .data.priceProducts }}€
+
Original price
+
{{ .data.priceProducts }}€
-
Shipping
-
{{ .data.shipping.Price }}€
+
Shipping
+
{{ .data.shipping.Price }}€
-
-
Total
-
{{ .data.priceTotal }}€
+
+
Total
+
{{ .data.priceTotal }}€
- + - +
diff --git a/views/printstarted.html b/views/printstarted.html index d470e46..5ae1498 100644 --- a/views/printstarted.html +++ b/views/printstarted.html @@ -1,9 +1,9 @@ {{ template "header.html" . }} -
+
-
+

Print Started

diff --git a/views/printvariant.html b/views/printvariant.html index f72d933..d328e84 100644 --- a/views/printvariant.html +++ b/views/printvariant.html @@ -1,9 +1,9 @@ {{ template "header.html" . }} -
+
-
+

Zineshop Print Service @@ -43,12 +43,12 @@ {{ else }} Not Tested {{ end }} - {{ range $.data.paper }} {{ end}} - {{ range $.data.paper }} diff --git a/views/shopitem.html b/views/shopitem.html index 7e8a7cd..e2fae0d 100644 --- a/views/shopitem.html +++ b/views/shopitem.html @@ -1,46 +1,46 @@ {{ template "header.html" . }} -
+
-
+
Product Image
{{ if .loggedIn }}
- +
{{ end }}
- +
{{ if .isAdmin }}
- +
{{ end }}
-

{{ .data.shopItem.Name }}

-

+

{{ .data.shopItem.Name }}

+

{{ .data.shopItem.Abstract }}

{{ if .loggedIn }}
- - {{ range .data.shopItem.Variants }} @@ -51,27 +51,27 @@
- Tags: + Tags:

{{ range .data.shopItem.Tags }} - {{ .Name }} + {{ .Name }} {{ end }}

- Product Description: -

+ Product Description: +

{{ .data.shopItem.Description }}

diff --git a/views/shopitems.html b/views/shopitems.html index ed2ce59..003b478 100644 --- a/views/shopitems.html +++ b/views/shopitems.html @@ -21,7 +21,7 @@

{{ range .Tags }} - {{ .Name }} + {{ .Name }} {{ end }}

diff --git a/views/tagview.html b/views/tagview.html index 6bd09e3..49371fa 100644 --- a/views/tagview.html +++ b/views/tagview.html @@ -14,7 +14,7 @@
Preview + ">Preview

x{{ .Quantity }}{{ .ItemVariant.Price }}€x{{ .Quantity }}{{ .ItemVariant.Price }}€