From 0600daec310ab10f821d6b58aa3cf871754bdc23 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 26 May 2022 16:26:20 +0200 Subject: [PATCH] Fixes --- forms/cms/home/style.css | 1 - forms/ecomerce/catalog/style.css | 5 ++- forms/ecomerce/catalog/ui.xml | 2 +- forms/ecomerce/confirm/locale/ca.yml | 2 + forms/ecomerce/confirm/locale/en.yml | 2 + forms/ecomerce/confirm/locale/es.yml | 2 + forms/ecomerce/confirm/locale/fr.yml | 2 + forms/ecomerce/confirm/locale/pt.yml | 2 + forms/ecomerce/confirm/style.css | 59 +++++++++++++++------------- forms/ecomerce/confirm/ui.xml | 21 ++++++---- js/hedera/login.scss | 28 ++++++------- js/hedera/login.xml | 20 +++++----- js/htk/style/components.scss | 6 +-- 13 files changed, 85 insertions(+), 67 deletions(-) diff --git a/forms/cms/home/style.css b/forms/cms/home/style.css index 772bed89..a38f59a4 100644 --- a/forms/cms/home/style.css +++ b/forms/cms/home/style.css @@ -48,7 +48,6 @@ .new-text { margin: 1.5em 0; font-family: 'Open Sans'; - line-height: 1.3em; } .new-text a { color: #6a1; diff --git a/forms/ecomerce/catalog/style.css b/forms/ecomerce/catalog/style.css index 2dc15597..4f673392 100644 --- a/forms/ecomerce/catalog/style.css +++ b/forms/ecomerce/catalog/style.css @@ -30,9 +30,11 @@ } .right-panel .basket-info > button { color: white; + background-color: rgba(0, 0, 0, .1); margin: 0 auto; display: block; - margin-top: .4em; + margin-top: 10px; + padding: 10px 15px; } .right-panel .basket-info > button:hover { background-color: white; @@ -41,7 +43,6 @@ .right-panel .basket-info > p { margin: 0; padding: .4em 0; - font-size: 1.1em; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index f6f2aa9b..dd54797c 100644 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -178,7 +178,7 @@

- diff --git a/forms/ecomerce/confirm/locale/ca.yml b/forms/ecomerce/confirm/locale/ca.yml index 969c8d00..5f84813a 100644 --- a/forms/ecomerce/confirm/locale/ca.yml +++ b/forms/ecomerce/confirm/locale/ca.yml @@ -1,5 +1,7 @@ Checkout: Finalitzar comanda Order summary: Resum de la comanda +ShippingInformation: Dades d'enviament +DeliveryAddress: Adreça de lliurament Delivery at: Lliurament el Agency: Agència Warehouse: Magatzem diff --git a/forms/ecomerce/confirm/locale/en.yml b/forms/ecomerce/confirm/locale/en.yml index e2b32f07..c480fa72 100644 --- a/forms/ecomerce/confirm/locale/en.yml +++ b/forms/ecomerce/confirm/locale/en.yml @@ -1,5 +1,7 @@ Checkout: Checkout Order summary: Order summary +ShippingInformation: Shipping information +DeliveryAddress: Delivery address Delivery at: Delivery at Agency: Agency Warehouse: Store diff --git a/forms/ecomerce/confirm/locale/es.yml b/forms/ecomerce/confirm/locale/es.yml index e344c094..08c65dac 100644 --- a/forms/ecomerce/confirm/locale/es.yml +++ b/forms/ecomerce/confirm/locale/es.yml @@ -1,5 +1,7 @@ Checkout: Finalizar pedido Order summary: Resumen del pedido +ShippingInformation: Datos de envío +DeliveryAddress: Dirección de entrega Delivery at: Entrega el Agency: Agencia Warehouse: Almacén diff --git a/forms/ecomerce/confirm/locale/fr.yml b/forms/ecomerce/confirm/locale/fr.yml index 743b0222..2bcdda8c 100644 --- a/forms/ecomerce/confirm/locale/fr.yml +++ b/forms/ecomerce/confirm/locale/fr.yml @@ -1,5 +1,7 @@ Checkout: Finir la commande Order summary: Résumé de la commande +ShippingInformation: Informations sur la livraison +DeliveryAddress: Addresse de livraison Delivery at: Livraison à Agency: Agence Warehouse: Entrepôt diff --git a/forms/ecomerce/confirm/locale/pt.yml b/forms/ecomerce/confirm/locale/pt.yml index efc04b53..6f44570a 100644 --- a/forms/ecomerce/confirm/locale/pt.yml +++ b/forms/ecomerce/confirm/locale/pt.yml @@ -1,5 +1,7 @@ Checkout: Finalizar encomenda Order summary: Resumo da encomenda +ShippingInformation: Dados de envio +DeliveryAddress: Endereço de entrega Delivery at: Entrega na Agency: Agência Warehouse: Armazém diff --git a/forms/ecomerce/confirm/style.css b/forms/ecomerce/confirm/style.css index 0f39b3f9..f5da4a6b 100644 --- a/forms/ecomerce/confirm/style.css +++ b/forms/ecomerce/confirm/style.css @@ -2,36 +2,9 @@ .confirm .summary { margin-bottom: 16px; } -.confirm .address { - margin-top: .8em; -} -.confirm h2 { - font-size: 1.1em; - font-weight: normal; - padding: 0; - margin: 0; - margin-bottom: .5em; - color: #333; -} -.confirm button { - font-size: 1.4em; -} .confirm p { margin: .2em 0; } -.confirm .modify-order { - float: left; -} -.confirm .confirm-order { - float: right; -} -.confirm .payment > div { - margin-bottom: 1.4em; -} -.confirm .payment > .button-bar { - margin: 0; - margin-top: 1.8em; -} /* Table */ @@ -86,3 +59,35 @@ .confirm .transfer-account > p { margin: .1em 0; } + +.confirm .payment > div { + margin-bottom: 1.4em; +} +.confirm .payment > .button-bar { + display: flex; + justify-content: space-between; + margin-bottom: 0; + margin-top: 32px; +} +.confirm .payment > .button-bar button{ + font-size: 1.2rem; + border-radius: 2rem; + padding: .5rem 1rem; + margin: 0; +} +.confirm .modify-order { + border: 1px solid #1a1a1a; +} +.confirm .modify-order:hover { + color: white; + background-color: #1a1a1a; +} +.confirm .confirm-order { + border: 1px solid #8cc63f; + background-color: #8cc63f; + color: white; +} +.confirm .confirm-order:hover { + background-color: transparent; + color: #6b5; +} \ No newline at end of file diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml index 740aadea..d54a014a 100644 --- a/forms/ecomerce/confirm/ui.xml +++ b/forms/ecomerce/confirm/ui.xml @@ -34,6 +34,7 @@
+
ShippingInformation

Delivery at @@ -43,7 +44,8 @@

-
+
+
DeliveryAddress

@@ -136,9 +138,7 @@
-

- Pay method -

+
Pay method
-
- - -
diff --git a/js/hedera/login.scss b/js/hedera/login.scss index 2ca34cda..66bb2f59 100644 --- a/js/hedera/login.scss +++ b/js/hedera/login.scss @@ -4,7 +4,6 @@ align-items: center; justify-content: center; color: #333; - font-size: 1.1em; font-weight: normal; height: inherit; background-color: white; @@ -52,21 +51,25 @@ background-color: #3d3f42; } } - @media (max-height: 50em) { + @media (max-height: 680px) { height: initial; } } +$login-margin-top: 50px; +$login-margin-between: 55px; + .vn-login > .column { max-width: 300px; & > .header { - margin-top: 60px; - margin-bottom: 80px; + margin-top: $login-margin-top; + margin-bottom: $login-margin-between; img { display: block; - width: 100%; + margin: 0 auto; + width: 90%; } .version-code { color: red; @@ -78,10 +81,10 @@ } } & > .footer { - margin-bottom: 60px; - margin-top: 80px; - font-size: 14px; + margin-bottom: $login-margin-top; + margin-top: $login-margin-between; text-align: center; + font-size: .85rem; .contact { margin-top: 15px; @@ -98,13 +101,6 @@ p { margin: 5px 0; } - label { - margin: 0; - } - & > .form-group > label { - display: block; - font-size: 14px; - } & > .remind-block { margin-top: 20px; margin-bottom: 40px; @@ -126,7 +122,7 @@ } .password-forgotten { text-align: center; - font-size: 14px; + font-size: .85rem; margin-top: 30px; } .enter { diff --git a/js/hedera/login.xml b/js/hedera/login.xml index 463b7373..c391edba 100644 --- a/js/hedera/login.xml +++ b/js/hedera/login.xml @@ -7,16 +7,18 @@
- +
- +
diff --git a/js/htk/style/components.scss b/js/htk/style/components.scss index 93580c6f..2372a5d3 100644 --- a/js/htk/style/components.scss +++ b/js/htk/style/components.scss @@ -634,11 +634,11 @@ td.cell-image .htk-image { .htk-search-entry { display: flex; align-items: center; - gap: 10px; + gap: 6px; background-color: white; height: 40px; border-radius: 20px; - padding: 0 15px; + padding: 0 12px; overflow: hidden; & > * { @@ -653,7 +653,7 @@ td.cell-image .htk-image { & > .entry { margin: 0; border: none; - width: 100px; + width: 80px; box-shadow: none; padding-right: 0; padding-left: 0;