From db666df676063357605c1d2c439596ea2ea453d8 Mon Sep 17 00:00:00 2001 From: nikolay Date: Mon, 17 Jul 2023 11:07:31 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#14384=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20WPA=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=84=D0=B5=D0=9B=D0=B0=D0=B9=D0=BA:=20change=20ba?= =?UTF-8?q?ckground=20to=20white?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/footer/footer.component.html | 2 +- .../components/navbar/navbar.component.html | 2 +- .../components/navbar/navbar.component.scss | 7 ++- .../guest-card/guest-card.component.html | 3 +- .../guest-card/guest-card.component.scss | 6 +- angular/src/styles.scss | 57 +++++++++---------- 6 files changed, 40 insertions(+), 37 deletions(-) diff --git a/angular/src/app/presentation-options/default-option/components/footer/footer.component.html b/angular/src/app/presentation-options/default-option/components/footer/footer.component.html index a3bb425..c79ae71 100644 --- a/angular/src/app/presentation-options/default-option/components/footer/footer.component.html +++ b/angular/src/app/presentation-options/default-option/components/footer/footer.component.html @@ -1,4 +1,4 @@ -Логотип +Логотип

Горячая линия

8 (800) 333-41-30 diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html index c4fe1eb..7883d88 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html @@ -8,7 +8,7 @@
diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss index 5ce2697..35a2e72 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss @@ -15,11 +15,10 @@ box-sizing: border-box; padding: 12px 16px; width: 100%; - background: var(--main-color_2); - color: var(--button-text-color); + background: var(--main-color_2); display: flex; flex-direction: column; - gap: 10px; + gap: 10px; .block { display: flex; align-items: center; @@ -33,6 +32,7 @@ display: flex; align-items: center; justify-content: center; + color: var(--button-text-color); } .plug { height: 24px; @@ -44,6 +44,7 @@ font-size: 17px; line-height: 22px; margin: 0 auto; + color: var(--button-text-color); } .menu { position: relative; diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html index a6acbd1..c7f414a 100644 --- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html +++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html @@ -24,7 +24,8 @@ [margin]="0" [size]="qrCodeSize" errorCorrectionLevel="H" - > + > + Покажи баристе

diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss index be38e90..f1ede8e 100644 --- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss +++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss @@ -35,9 +35,11 @@ &__qr { margin: 10px; padding: 5px; - width: fit-content; - background-color: var(--text-color); + width: fit-content; border-radius: 6px; + align-items: center; + display: flex; + flex-direction: column; // background-image: linear-gradient( // #008251 33%, // transparent 0px, diff --git a/angular/src/styles.scss b/angular/src/styles.scss index b0a76ba..9cf58a6 100644 --- a/angular/src/styles.scss +++ b/angular/src/styles.scss @@ -36,39 +36,38 @@ $primary: ( ); $accent: ( - 50 : #e5e4e4, - 100 : #bdbcbc, - 200 : #918f90, - 300 : #656263, - 400 : #444141, - 500 : #231f20, - 600 : #1f1b1c, - 700 : #1a1718, - 800 : #151213, - 900 : #0c0a0b, - A100 : #ff52ff, - A200 : #ff1fff, - A400 : #eb00eb, - A700 : #d200d2, + 50 : #ffffff, + 100 : #ffffff, + 200 : #ffffff, + 300 : #ffffff, + 400 : #ffffff, + 500 : #ffffff, + 600 : #ffffff, + 700 : #ffffff, + 800 : #ffffff, + 900 : #ffffff, + A100 : #ffffff, + A200 : #ffffff, + A400 : #ffffff, + A700 : #ffffff, contrast: ( 50 : #000000, 100 : #000000, 200 : #000000, - 300 : #ffffff, - 400 : #ffffff, - 500 : #ffffff, - 600 : #ffffff, - 700 : #ffffff, - 800 : #ffffff, - 900 : #ffffff, + 300 : #000000, + 400 : #000000, + 500 : #000000, + 600 : #000000, + 700 : #000000, + 800 : #000000, + 900 : #000000, A100 : #000000, - A200 : #ffffff, - A400 : #ffffff, - A700 : #ffffff, + A200 : #000000, + A400 : #000000, + A700 : #000000, ) ); - $primary-palette: mat.define-palette($primary); $accent-palette: mat.define-palette($accent); @@ -115,10 +114,10 @@ body { --main-color: #28AF49; --main-color_2: #005C50; --main-border-radius: 35px; - --background-color: #231F20; - --background-color_1: #000000; + --background-color: #ffffff; + --background-color_1: #ffffff; - --text-color: #ffffff; + --text-color: #000000; --text-color_1: #8d8d8d; --button-color: #28AF49 ; @@ -157,7 +156,7 @@ body { } .mdc-button__label span { - color: var(--button-text-color) !important; + color: var(--text-color) !important; } .mat-mdc-outlined-button:not(:disabled) {