From 0f71e2b595896eb11e0b390591d99654e59c615c Mon Sep 17 00:00:00 2001 From: Hannes Date: Sat, 18 Jan 2020 14:01:35 +0100 Subject: [PATCH] remade articleDetail without own css --- .../resources/static/css/articleDetail.css | 30 -------- .../src/main/resources/static/css/ecom.css | 18 ++++- .../resources/templates/articleDetail.html | 68 +++++++++---------- 3 files changed, 48 insertions(+), 68 deletions(-) delete mode 100644 prototype/src/main/resources/static/css/articleDetail.css diff --git a/prototype/src/main/resources/static/css/articleDetail.css b/prototype/src/main/resources/static/css/articleDetail.css deleted file mode 100644 index 6eadefd..0000000 --- a/prototype/src/main/resources/static/css/articleDetail.css +++ /dev/null @@ -1,30 +0,0 @@ -.articledetail { - max-width: 100%; - padding: 2em; - background-color: var(--c-primary); -} - -.availability { - color: var(--root-c-secondary); -} - -.checkout { - border: 0px; - border-left: 2px; - border-color: var(--c-white); - border-style: solid; -} - -.quantity { - display: flex; -} - -.quantity label { - min-width: 5em; - margin-bottom: 0px; - padding-left: 15px; -} - -.checkout button { - background-color: var(--root-c-secondary); -} \ No newline at end of file diff --git a/prototype/src/main/resources/static/css/ecom.css b/prototype/src/main/resources/static/css/ecom.css index ebe90d9..a04d92e 100644 --- a/prototype/src/main/resources/static/css/ecom.css +++ b/prototype/src/main/resources/static/css/ecom.css @@ -35,7 +35,7 @@ --c-primary: var(--root-c-primary); --c-primary-highlight: var(--root-c-primary-highlight); - --c-secondary: var(--c-secondary); + --c-secondary: var(--root-c-secondary); --c-secondary-highlight: var(--root-c-secondary-highlight); --c-black: var(--root-c-black); @@ -313,6 +313,10 @@ label { font-weight: bold; } +label.nolinebreak { + display:inline; +} + input.linestyle { background-color: transparent; border-bottom: var(--u-4) solid var(--c-primary); @@ -339,6 +343,14 @@ fieldset { color: var(--c-base); } +.primarytext{ + color: var(--c-primary) +} + +.secondarytext{ + color: var(--c-secondary) +} + /* * LAYOUT */ @@ -564,3 +576,7 @@ fieldset { font-size: var(--u1); text-align: right; } + + + + diff --git a/prototype/src/main/resources/templates/articleDetail.html b/prototype/src/main/resources/templates/articleDetail.html index 684fca6..77e361e 100644 --- a/prototype/src/main/resources/templates/articleDetail.html +++ b/prototype/src/main/resources/templates/articleDetail.html @@ -3,49 +3,43 @@ e-commerce - - -
-
-
-
-
- -
-
-

Tolle Kamera

-

25.14 €

-

- Eine TOLLE Kamera
- Jaja du denkst jetzt bestimmt: "Bei dem Preis kann sie gar nich sooo TOLL sein".
- Aber glaub mir, sie is echt echt TOLL!
- Indianerehrenwort! -

-
-
-

50.28 €

-

Auf Lager

-
-
-
- - -
-
-
-
- -
+
+
+
+ +
+
+

Tolle Kamera

+

25.14 €

+

+ Eine TOLLE Kamera
+ Jaja du denkst jetzt bestimmt: "Bei dem Preis kann sie gar nich sooo TOLL sein".
+ Aber glaub mir, sie is echt echt TOLL!
+ Indianerehrenwort! +

+
+
+

50.28 €

+

Auf Lager

+
+
+
+ +
-
-
+ +
+
+ +
+
\ No newline at end of file