diff --git a/src/app/shared/components/workshop-card/workshop-card.component.scss b/src/app/shared/components/workshop-card/workshop-card.component.scss index 0464b0b1b0..5e69e87461 100644 --- a/src/app/shared/components/workshop-card/workshop-card.component.scss +++ b/src/app/shared/components/workshop-card/workshop-card.component.scss @@ -64,7 +64,7 @@ object-position: bottom; } - .wrap-for-details .mat-card-header { + .wrap-for-details .mat-mdc-card-header { margin-bottom: 1rem; } @@ -74,7 +74,7 @@ } .wrap-for-details, -.mat-card-content { +.mat-mdc-card-content { flex: 1; } .more-details { @@ -96,7 +96,7 @@ } } -::ng-deep .mat-card-header .mat-card-title { +::ng-deep .mat-mdc-card-header .mat-mdc-card-title { height: 30px !important; } @@ -117,29 +117,29 @@ .wrap-for-details-map { padding: 0.75rem; - .mat-card-content { + .mat-mdc-card-content { margin-bottom: 0.5rem; } } .card_text { margin: 0; } - .mat-card-image { + .mat-mdc-card-image { height: 150px; width: 150px; } - .mat-card-header img { + .mat-mdc-card-header img { width: 21px; height: 21px; } .hide { display: none; } - ::ng-deep .mat-card-header-text { + ::ng-deep .mat-mdc-card-header-text { margin: 0; } .card-title, - .mat-card-header { + .mat-mdc-card-header { font-size: 15px; } } diff --git a/src/app/shared/modules/material.module.ts b/src/app/shared/modules/material.module.ts index 5afa56e450..ddbb3b17bc 100644 --- a/src/app/shared/modules/material.module.ts +++ b/src/app/shared/modules/material.module.ts @@ -9,7 +9,7 @@ import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; +import { MatCardModule } from '@angular/material/card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { MatDialogModule } from '@angular/material/dialog'; diff --git a/src/app/shared/styles/cards.scss b/src/app/shared/styles/cards.scss index f125491717..642ada503b 100644 --- a/src/app/shared/styles/cards.scss +++ b/src/app/shared/styles/cards.scss @@ -165,17 +165,17 @@ .chip_denied { background: red; } -.mat-card { +.mat-mdc-card { padding: 0; } -.mat-card-footer { +.mat-mdc-card-footer { margin: 0 !important; } -.mat-card-header { +.mat-mdc-card-header { display: flex; justify-content: space-between; align-items: center; - .mat-card-title { + .mat-mdc-card-title { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -188,11 +188,11 @@ margin-block-end: auto; } } -::ng-deep .mat-card-header-text { +::ng-deep .mat-mdc-card-header-text { width: calc(100% - 40px); margin: 0 !important; } -.mat-card-image { +.mat-mdc-card-image { display: flex; flex-direction: row; justify-content: center; @@ -211,3 +211,18 @@ width: 100%; height: 180px; } + +.mat-mdc-card-content { + margin-bottom: 16px; +} +.mat-mdc-card-header, +.mat-mdc-card-content, +.mat-mdc-card-content:first-child { + padding: 0; +} +.mat-mdc-card > :first-child { + margin-top: 0; +} +.mat-mdc-card-content:last-child { + padding-bottom: 0; +} diff --git a/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.scss b/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.scss index 145c1d4de4..a0006f74b0 100644 --- a/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.scss +++ b/src/app/shell/details/details-tabs/achievements/achievement-card/achievement-card.component.scss @@ -1,7 +1,7 @@ @import 'src/app/shared/styles/card-wrapper.scss'; @import 'src/app/shared/styles/cards.scss'; -.mat-card { +.mat-mdc-card { margin: 1.3rem; } @@ -53,6 +53,10 @@ cursor: pointer; } +.mat-mdc-card-content > :first-child { + margin-top: 0; +} + @media (max-width: 750px) { .image { display: none; diff --git a/src/app/shell/details/details-tabs/workshop-teachers/teacher-card/teacher-card.component.scss b/src/app/shell/details/details-tabs/workshop-teachers/teacher-card/teacher-card.component.scss index ffb49a88ce..0b5b7555fe 100644 --- a/src/app/shell/details/details-tabs/workshop-teachers/teacher-card/teacher-card.component.scss +++ b/src/app/shell/details/details-tabs/workshop-teachers/teacher-card/teacher-card.component.scss @@ -3,3 +3,7 @@ .wrap-for-details { word-break: break-all; } + +.mat-mdc-card-content .card_text { + margin-top: 0; +} diff --git a/src/app/shell/personal-cabinet/parent/children/child-card/child-card.component.scss b/src/app/shell/personal-cabinet/parent/children/child-card/child-card.component.scss index b3cb02f743..8d15c07699 100644 --- a/src/app/shell/personal-cabinet/parent/children/child-card/child-card.component.scss +++ b/src/app/shell/personal-cabinet/parent/children/child-card/child-card.component.scss @@ -14,8 +14,8 @@ color: #aaaaaa; } -.mat-card-header { - .mat-card-title { +.mat-mdc-card-header { + .mat-mdc-card-title { max-width: 235px; width: 100%; } @@ -37,3 +37,7 @@ } } } + +.mat-mdc-card-content .card_text { + margin-top: 0; +} diff --git a/src/app/shell/personal-cabinet/shared-cabinet/applications/application-card/application-card.component.scss b/src/app/shell/personal-cabinet/shared-cabinet/applications/application-card/application-card.component.scss index b0909d1dee..9f9470210a 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/applications/application-card/application-card.component.scss +++ b/src/app/shell/personal-cabinet/shared-cabinet/applications/application-card/application-card.component.scss @@ -3,6 +3,7 @@ .card-block { max-width: 100%; + padding: 0 !important; &:first-child { width: 100%; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/applications/application-card/child-info-box/child-info-box.component.scss b/src/app/shell/personal-cabinet/shared-cabinet/applications/application-card/child-info-box/child-info-box.component.scss index 5849aaadf3..c67862da46 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/applications/application-card/child-info-box/child-info-box.component.scss +++ b/src/app/shell/personal-cabinet/shared-cabinet/applications/application-card/child-info-box/child-info-box.component.scss @@ -1,3 +1,7 @@ +.mat-mdc-card { + box-sizing: content-box; +} + .card { display: block; z-index: 100; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/messages/chat/chat.component.scss b/src/app/shell/personal-cabinet/shared-cabinet/messages/chat/chat.component.scss index d157a646bd..9995d1becb 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/messages/chat/chat.component.scss +++ b/src/app/shell/personal-cabinet/shared-cabinet/messages/chat/chat.component.scss @@ -1,5 +1,10 @@ @import 'src/app/shared/styles/buttons.scss'; +.mat-mdc-card { + padding: 16px; + box-sizing: content-box; +} + .chat-card { display: flex; flex-direction: column; diff --git a/src/app/shell/personal-cabinet/shared-cabinet/messages/message-card/message-card.component.scss b/src/app/shell/personal-cabinet/shared-cabinet/messages/message-card/message-card.component.scss index c9c3f47d91..9c00c3ee62 100644 --- a/src/app/shell/personal-cabinet/shared-cabinet/messages/message-card/message-card.component.scss +++ b/src/app/shell/personal-cabinet/shared-cabinet/messages/message-card/message-card.component.scss @@ -84,3 +84,7 @@ margin-top: 2px !important; } } + +.mat-mdc-card-content { + padding: 0 !important; +} diff --git a/src/styles.scss b/src/styles.scss index 4bbb6503b2..100fe9c927 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -250,7 +250,7 @@ a { background-color: #ffffff !important; } -.mat-card-image:first-child { +.mat-mdc-card-image:first-child { margin-top: 0 !important; }