change colors to old version
This commit is contained in:
parent
9d00a32d4f
commit
5cb88250c5
@ -75,6 +75,7 @@
|
|||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height: 19px;
|
line-height: 19px;
|
||||||
letter-spacing: -0.5px;
|
letter-spacing: -0.5px;
|
||||||
|
color: var(--text-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
.price,
|
.price,
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
<img src="/assets/logo-light-theme.png" alt="Логотип">
|
<img src="/assets/logo.svg" alt="Логотип">
|
||||||
<h3>Горячая линия</h3>
|
<h3>Горячая линия</h3>
|
||||||
<a class="phone-number" href="tel:88003334130">8 (800) 333-41-30</a>
|
<a class="phone-number" href="tel:88003334130">8 (800) 333-41-30</a>
|
||||||
<app-social-media-buttons></app-social-media-buttons>
|
<app-social-media-buttons></app-social-media-buttons>
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: background-color 0.1s;
|
transition: background-color 0.1s;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: var(--main-color_hover);
|
background-color: var(--main-color_hover);
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
<div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div>
|
<div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div>
|
||||||
<div class="menu">
|
<div class="menu">
|
||||||
<button mat-button (click)="toggleMenu()">
|
<button mat-button (click)="toggleMenu()">
|
||||||
<span class="material-icons" style="color: white !important">
|
<span class="material-icons" style="color: var(--text-color) !important">
|
||||||
more_horiz
|
more_horiz
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
@ -16,7 +16,7 @@
|
|||||||
<div class="menu__dropdown" *ngIf="showDropdown">
|
<div class="menu__dropdown" *ngIf="showDropdown">
|
||||||
<ul>
|
<ul>
|
||||||
<menu-item [handler]="handler(aboutApp)">
|
<menu-item [handler]="handler(aboutApp)">
|
||||||
<span class="material-icons icon" style="color: var(--main-color)">
|
<span class="material-icons icon" style="color: var(--main-color_2)">
|
||||||
info
|
info
|
||||||
</span>
|
</span>
|
||||||
<span class="item_title">О приложении</span>
|
<span class="item_title">О приложении</span>
|
||||||
@ -34,8 +34,8 @@
|
|||||||
Установить приложение
|
Установить приложение
|
||||||
</span>
|
</span>
|
||||||
</menu-item>
|
</menu-item>
|
||||||
<menu-item *ngIf="!messagingService.checkRequestPermission()" [handler]="handler(messagingService.requestPermission)">
|
<menu-item *ngIf="!notified()" [handler]="handler(notify)">
|
||||||
<span class="material-icons" style="color: var(--main-color)">
|
<span class="material-icons" style="color: var(--main-color_2)">
|
||||||
notifications
|
notifications
|
||||||
</span>
|
</span>
|
||||||
<span class="item_title">
|
<span class="item_title">
|
||||||
@ -44,7 +44,7 @@
|
|||||||
</menu-item>
|
</menu-item>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<menu-item [handler]="handler(logout)">
|
<menu-item [handler]="handler(logout)">
|
||||||
<span class="material-icons" style="color: var(--main-color)">
|
<span class="material-icons" style="color: var(--main-color_2)">
|
||||||
logout
|
logout
|
||||||
</span>
|
</span>
|
||||||
<span class="item_title">Выйти</span>
|
<span class="item_title">Выйти</span>
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 12px 16px;
|
padding: 12px 16px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background: var(--button-color);
|
background: var(--main-color_2);
|
||||||
color: var(--button-text-color);
|
color: var(--button-text-color);
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@ -52,12 +52,13 @@
|
|||||||
.menu__dropdown {
|
.menu__dropdown {
|
||||||
z-index: 110;
|
z-index: 110;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background-color: white;
|
background-color: var(--background-color_1);
|
||||||
width: 250px;
|
width: 250px;
|
||||||
height: fit-content;
|
height: fit-content;
|
||||||
right: 20px;
|
right: 20px;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
box-shadow: 0px 2px 5px -3px black;
|
box-shadow: 0px 2px 5px -3px black;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
.item_title {
|
.item_title {
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
|
|||||||
@ -10,10 +10,10 @@ import { AuthService } from 'src/app/services/auth.service';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'app-navbar[title]',
|
selector: 'app-navbar[title]',
|
||||||
templateUrl: './navbar.component.html',
|
templateUrl: './navbar.component.html',
|
||||||
styleUrls: ['./navbar.component.scss']
|
styleUrls: ['./navbar.component.scss'],
|
||||||
})
|
})
|
||||||
export class NavbarComponent implements OnInit {
|
export class NavbarComponent implements OnInit {
|
||||||
@Input() title: string = 'Название не задано'
|
@Input() title: string = 'Название не задано';
|
||||||
@Input() backEvent?: () => void;
|
@Input() backEvent?: () => void;
|
||||||
|
|
||||||
showDropdown: boolean = false;
|
showDropdown: boolean = false;
|
||||||
@ -24,17 +24,17 @@ export class NavbarComponent implements OnInit {
|
|||||||
private appleWalletService: AppleWalletService,
|
private appleWalletService: AppleWalletService,
|
||||||
private cookiesService: CookiesService,
|
private cookiesService: CookiesService,
|
||||||
private _bottomSheet: MatBottomSheet,
|
private _bottomSheet: MatBottomSheet,
|
||||||
private authService: AuthService,
|
private authService: AuthService
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
handler(cb: () => void): (e: any) => void {
|
handler(cb: () => void): (e: any) => void {
|
||||||
return (e: any) => {
|
return (e: any) => {
|
||||||
cb();
|
cb();
|
||||||
this.closeMenu();
|
this.closeMenu();
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
aboutApp() { }
|
aboutApp() {}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.isios = getTypeDevice() == DeviceType.ios;
|
this.isios = getTypeDevice() == DeviceType.ios;
|
||||||
@ -50,7 +50,7 @@ export class NavbarComponent implements OnInit {
|
|||||||
|
|
||||||
closeMenu = () => {
|
closeMenu = () => {
|
||||||
this.showDropdown = false;
|
this.showDropdown = false;
|
||||||
}
|
};
|
||||||
|
|
||||||
back() {
|
back() {
|
||||||
if (this.backEvent) {
|
if (this.backEvent) {
|
||||||
@ -60,11 +60,11 @@ export class NavbarComponent implements OnInit {
|
|||||||
|
|
||||||
addToWallet = () => {
|
addToWallet = () => {
|
||||||
this.appleWalletService.addCardToWallet();
|
this.appleWalletService.addCardToWallet();
|
||||||
}
|
};
|
||||||
|
|
||||||
deleteToken = (): void => {
|
deleteToken = (): void => {
|
||||||
this.cookiesService.logout();
|
this.cookiesService.logout();
|
||||||
}
|
};
|
||||||
|
|
||||||
logout = () => {
|
logout = () => {
|
||||||
const bottomSheet = this._bottomSheet.open(ExitComponent);
|
const bottomSheet = this._bottomSheet.open(ExitComponent);
|
||||||
@ -75,8 +75,15 @@ export class NavbarComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
installApp = () => { }
|
installApp = () => {};
|
||||||
|
|
||||||
|
notified = () => {
|
||||||
|
return this.messagingService.checkRequestPermission();
|
||||||
|
};
|
||||||
|
|
||||||
|
notify = () => {
|
||||||
|
this.messagingService.requestPermission();
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
width: 48px;
|
width: 48px;
|
||||||
height: 48px;
|
height: 48px;
|
||||||
border-radius: 100%;
|
border-radius: 100%;
|
||||||
background: var(--button-color);
|
background: var(--main-color_2);
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|||||||
@ -36,6 +36,8 @@
|
|||||||
margin: 10px;
|
margin: 10px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
|
background-color: var(--text-color);
|
||||||
|
border-radius: 6px;
|
||||||
// background-image: linear-gradient(
|
// background-image: linear-gradient(
|
||||||
// #008251 33%,
|
// #008251 33%,
|
||||||
// transparent 0px,
|
// transparent 0px,
|
||||||
|
|||||||
@ -153,8 +153,8 @@
|
|||||||
will-change: transform;
|
will-change: transform;
|
||||||
}
|
}
|
||||||
.box:focus-within {
|
.box:focus-within {
|
||||||
box-shadow: 0 0 6px 1px rgba(rgb(127, 32, 97), 0.2),
|
box-shadow: 0 0 6px 1px rgba(rgb(0, 92, 80), 0.2),
|
||||||
0 0 0 2px rgba(rgb(127, 32, 97), 0.6);
|
0 0 0 2px rgba(rgb(0, 92, 80), 0.6);
|
||||||
}
|
}
|
||||||
.box::before,
|
.box::before,
|
||||||
.box::after {
|
.box::after {
|
||||||
|
|||||||
@ -3,20 +3,53 @@
|
|||||||
@include mat.core();
|
@include mat.core();
|
||||||
|
|
||||||
$primary: (
|
$primary: (
|
||||||
50 : #f0e4ec,
|
50 : #e5f5e9,
|
||||||
100 : #d9bcd0,
|
100 : #bfe7c8,
|
||||||
200 : #bf90b0,
|
200 : #94d7a4,
|
||||||
300 : #a56390,
|
300 : #69c780,
|
||||||
400 : #924179,
|
400 : #48bb64,
|
||||||
500 : #7f2061,
|
500 : #28af49,
|
||||||
600 : #771c59,
|
600 : #24a842,
|
||||||
700 : #6c184f,
|
700 : #1e9f39,
|
||||||
800 : #621345,
|
800 : #189631,
|
||||||
900 : #4f0b33,
|
900 : #0f8621,
|
||||||
A100 : #ff85c7,
|
A100 : #b8ffc0,
|
||||||
A200 : #ff52b0,
|
A200 : #85ff94,
|
||||||
A400 : #ff1f99,
|
A400 : #52ff67,
|
||||||
A700 : #ff068d,
|
A700 : #38ff51,
|
||||||
|
contrast: (
|
||||||
|
50 : #000000,
|
||||||
|
100 : #000000,
|
||||||
|
200 : #000000,
|
||||||
|
300 : #000000,
|
||||||
|
400 : #000000,
|
||||||
|
500 : #ffffff,
|
||||||
|
600 : #ffffff,
|
||||||
|
700 : #ffffff,
|
||||||
|
800 : #ffffff,
|
||||||
|
900 : #ffffff,
|
||||||
|
A100 : #000000,
|
||||||
|
A200 : #000000,
|
||||||
|
A400 : #000000,
|
||||||
|
A700 : #000000,
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
$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,
|
||||||
contrast: (
|
contrast: (
|
||||||
50 : #000000,
|
50 : #000000,
|
||||||
100 : #000000,
|
100 : #000000,
|
||||||
@ -29,44 +62,12 @@ $primary: (
|
|||||||
800 : #ffffff,
|
800 : #ffffff,
|
||||||
900 : #ffffff,
|
900 : #ffffff,
|
||||||
A100 : #000000,
|
A100 : #000000,
|
||||||
A200 : #000000,
|
A200 : #ffffff,
|
||||||
A400 : #ffffff,
|
A400 : #ffffff,
|
||||||
A700 : #ffffff,
|
A700 : #ffffff,
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
$accent: (
|
|
||||||
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 : #000000,
|
|
||||||
400 : #000000,
|
|
||||||
500 : #000000,
|
|
||||||
600 : #000000,
|
|
||||||
700 : #000000,
|
|
||||||
800 : #000000,
|
|
||||||
900 : #000000,
|
|
||||||
A100 : #000000,
|
|
||||||
A200 : #000000,
|
|
||||||
A400 : #000000,
|
|
||||||
A700 : #000000,
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
$primary-palette: mat.define-palette($primary);
|
$primary-palette: mat.define-palette($primary);
|
||||||
$accent-palette: mat.define-palette($accent);
|
$accent-palette: mat.define-palette($accent);
|
||||||
@ -111,23 +112,51 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
--main-color: #7F2061;
|
--main-color: #28AF49;
|
||||||
|
--main-color_2: #005C50;
|
||||||
--main-border-radius: 35px;
|
--main-border-radius: 35px;
|
||||||
--background-color: #ffffff;
|
--background-color: #231F20;
|
||||||
|
--background-color_1: #000000;
|
||||||
|
|
||||||
--text-color: #222222;
|
--text-color: #ffffff;
|
||||||
--text-color_1: #666666;
|
--text-color_1: #8d8d8d;
|
||||||
|
|
||||||
--button-color: #7F2061;
|
--button-color: #28AF49 ;
|
||||||
--button-color_disabled: #4a0d37;
|
--button-color_disabled: rgb(40, 175, 73, 0.9);
|
||||||
|
|
||||||
--button-text-color: #ffffff;
|
--button-text-color: #ffffff;
|
||||||
--button-text-color_disabled: #cccccc;
|
--button-text-color_disabled: #cccccc;
|
||||||
|
|
||||||
--main-color_hover: rgba(127, 32, 97, 0.3);
|
--main-color_hover: rgba(40, 175, 73, 0.6);
|
||||||
}
|
}
|
||||||
|
|
||||||
.mdc-button__label {
|
.mdc-text-field--outlined:not(.mdc-text-field--disabled, .mdc-text-field--invalid, .mat-focused) .mdc-notched-outline__leading,
|
||||||
|
.mdc-text-field--outlined:not(.mdc-text-field--disabled, .mdc-text-field--invalid, .mat-focused) .mdc-notched-outline__notch,
|
||||||
|
.mdc-text-field--outlined:not(.mdc-text-field--disabled, .mdc-text-field--invalid, .mat-focused) .mdc-notched-outline__trailing {
|
||||||
|
border-color: var(--main-color_hover) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mat-mdc-outlined-button:not(:disabled) {
|
||||||
|
border-color: var(--text-color) !important;
|
||||||
|
|
||||||
|
.mdc-button__label {
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.mdc-text-field:not(.mdc-text-field--disabled, .mdc-text-field--invalid) .mdc-floating-label {
|
||||||
|
color: var(--main-color_hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.mdc-text-field span {
|
||||||
|
color: inherit !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input {
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.mdc-button__label span {
|
||||||
color: var(--button-text-color) !important;
|
color: var(--button-text-color) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -143,6 +172,10 @@ body {
|
|||||||
font-family: Montserrat;
|
font-family: Montserrat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
p, span, h1, h2, h3, h4, h5, h6 {
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
.mat-h2,
|
.mat-h2,
|
||||||
.mat-headline-6,
|
.mat-headline-6,
|
||||||
.mat-typography .mat-h2,
|
.mat-typography .mat-h2,
|
||||||
@ -151,6 +184,12 @@ body {
|
|||||||
font-family: Montserrat, sans-serif;
|
font-family: Montserrat, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.mat-bottom-sheet-container {
|
||||||
|
background: var(--background-color_1);
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
hr {
|
hr {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-top: 1px solid #BDBDBD;
|
border-top: 1px solid #BDBDBD;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user