From 5ea194cd960eb1ac8a073c4dd3b74a71237400a0 Mon Sep 17 00:00:00 2001 From: b-leech Date: Mon, 10 Oct 2022 18:11:45 +0200 Subject: [PATCH] Commiting please work ;( --- app/static/css/application.css | 103 ++++--- app/templates/component.html | 539 +++++++++++++++++---------------- 2 files changed, 339 insertions(+), 303 deletions(-) diff --git a/app/static/css/application.css b/app/static/css/application.css index cfa03fb..1b8e833 100644 --- a/app/static/css/application.css +++ b/app/static/css/application.css @@ -15,6 +15,15 @@ body { box-sizing: border-box; } +a { + color: var(--main-text); +} + +.nav-link.active { + background-color: var(--main-green) !important; + color: var(--main-grey) !important; +} + a, u { text-decoration: none; @@ -47,6 +56,8 @@ a:hover { .row { height: 100%; + margin-left: 0; + margin-right: 0; } .dropIn-UI { @@ -925,13 +936,13 @@ a:hover { --text-italic: normal; --small-text: 12px; --payButton-width: 100%; - --payments-spacing: 0px 0; - --paymentselected-margin: 8px 0; - --selectedBody-edges: 12px; - --topedges-left: 12px; - --topedges-right: 12px; - --bottomedges-left: 12px; - --bottomedges-right: 12px; + --payments-spacing: 0px 0; + --paymentselected-margin: 8px 0; + --selectedBody-edges: 12px; + --topedges-left: 12px; + --topedges-right: 12px; + --bottomedges-left: 12px; + --bottomedges-right: 12px; } .card-visited .card__back { @@ -960,13 +971,13 @@ a:hover { } */ .adyen-checkout__button.adyen-checkout__button--pay { - width: var(--payButton-width) !important; - margin-right: auto; - margin-left: auto; - display: flex; - justify-content: center; - background: var(--background-color) !important; - border-radius: var(--button-edges) !important; + width: var(--payButton-width) !important; + margin-right: auto; + margin-left: auto; + display: flex; + justify-content: center; + background: var(--background-color) !important; + border-radius: var(--button-edges) !important; } .form-group { @@ -977,23 +988,22 @@ a:hover { } .adyen-checkout__payment-method { - width: var(--dropin-width) !important; - font-size: var(--dropin-font) !important; - font-family: var(--font-options) !important; - text-align: var(--text-align) !important; - border-radius: var(--body-edges) !important; - border: var(--border-off) !important; - background: var(--dropin-tab-color) !important; - font-weight: var(--text-bold) !important; - margin: var(--payments-spacing) !important; + width: var(--dropin-width) !important; + font-size: var(--dropin-font) !important; + font-family: var(--font-options) !important; + text-align: var(--text-align) !important; + border-radius: var(--body-edges) !important; + border: var(--border-off) !important; + background: var(--dropin-tab-color) !important; + font-weight: var(--text-bold) !important; + margin: var(--payments-spacing) !important; } -.adyen-checkout__payment-methods-list li:nth-child(2){ - border-top-left-radius: var(--topedges-left) !important; - border-top-right-radius: var(--topedges-right) !important; +.adyen-checkout__payment-methods-list li:nth-child(2) { + border-top-left-radius: var(--topedges-left) !important; + border-top-right-radius: var(--topedges-right) !important; } - .adyen-checkout__payment-methods-list li:last-child { border-bottom-left-radius: var(--bottomedges-left) !important; border-bottom-right-radius: var(--bottomedges-right) !important; @@ -1004,10 +1014,9 @@ a:hover { } .adyen-checkout__payment-method--selected { - background: var(--dropin-color) !important; - margin: var(--paymentselected-margin) !important; - border-radius: var(--selectedBody-edges) !important; - + background: var(--dropin-color) !important; + margin: var(--paymentselected-margin) !important; + border-radius: var(--selectedBody-edges) !important; } .adyen-checkout__payment-method__radio { @@ -1125,18 +1134,24 @@ a:hover { } */ pre { - outline: 1px solid #ccc; - padding: 5px; - margin: 5px; - background: #00112c; - color: #078F3E; + outline: 1px solid #ccc; + padding: 5px; + margin: 5px; + background: #00112c; + color: #078f3e; } -.string { - color: white; +.string { + color: white; +} +.number { + color: #0abf53; +} +.boolean { + color: #0088ff; +} +.null { + color: magenta; +} +.key { + color: #a5afbd; } -.number { color: #0abf53; } -.boolean { color: #0088FF; } -.null { color: magenta; } -.key { color: #A5AFBD; } - - diff --git a/app/templates/component.html b/app/templates/component.html index 746ef24..c096f68 100644 --- a/app/templates/component.html +++ b/app/templates/component.html @@ -15,6 +15,8 @@ rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css" /> + + - - + Checkout Create @@ -76,18 +80,31 @@
- - -

Your order has been successfully placed.

- Return Home + + +

+ Your order has been successfully placed. +

+ Return Home
-

Error!

-

Review response in console and refer to Response handling.

- Return Home +

Error!

+

+ Review response in console and refer to + Response handling. +

+ Return Home
@@ -276,47 +293,42 @@

Location

-
- -
-

- Choose your shopper location and language -

-
- -
-

Shopper Location

-
- -
-
- - - + +
+

+ Choose your shopper location and language +

+
+ +
+

Shopper Location

+
+ +
+
+ + +
@@ -324,17 +336,16 @@
- - -
-
-

Payment Methods

-
-
+ +
+
+

Payment Methods

+

- Choose which payment methods you would like to see at checkout + Choose which payment methods you would like to see at + checkout

@@ -343,211 +354,204 @@
-
- - +
+ +
-
- -
+ +
+ + +
+
+

Payment Method Behaviour

+
- -
-
-

Payment Method Behaviour

-
-

- Select how you'd like your payment methods to behave at checkout + Select how you'd like your payment methods to behave at + checkout

-
- -
-

- Select how you'd like your payment methods to behave - at checkout -

-
- -
-

- Open first payment method -

-
- -
-
- - -
+ +
+

+ Open first payment method +

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

- Hide stored payment methods -

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

+ Hide stored payment methods +

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

- Add billing address -

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

+ Add billing address +

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

- Include card holder name -

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

+ Include card holder name +

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

- Show only saved Payment Methods -

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

+ Show only saved Payment Methods +

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

Hide CVC field

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

Hide CVC field

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

- Include placeholder data -

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

+ Include placeholder data +

+
+ +
+
+ +
-
-
-
@@ -977,36 +980,41 @@
- -
+
+
-

Payment methods spacing

+

+ Payment methods spacing +

- +
-
-
- -
-
@@ -1025,6 +1033,7 @@ role="tabpanel" aria-labelledby="save-tab" > + <<<<<<< Updated upstream

Adyen Configuration

@@ -1032,7 +1041,9 @@
-
+
@@ -1043,10 +1054,20 @@
-
+
+ ======= +
+
+ >>>>>>> Stashed changes