diff --git a/client/src/app/gateways/export/progress-snack-bar/progress-snack-bar.module.ts b/client/src/app/gateways/export/progress-snack-bar/progress-snack-bar.module.ts index 532fd5c86c..215a7b8cd1 100644 --- a/client/src/app/gateways/export/progress-snack-bar/progress-snack-bar.module.ts +++ b/client/src/app/gateways/export/progress-snack-bar/progress-snack-bar.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/client/src/app/site/modules/global-headbar/global-headbar.module.ts b/client/src/app/site/modules/global-headbar/global-headbar.module.ts index f3f69b3845..050b7ce805 100644 --- a/client/src/app/site/modules/global-headbar/global-headbar.module.ts +++ b/client/src/app/site/modules/global-headbar/global-headbar.module.ts @@ -4,10 +4,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatBadgeModule } from '@angular/material/badge'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; diff --git a/client/src/app/site/modules/info/info.module.ts b/client/src/app/site/modules/info/info.module.ts index 3b450a9221..b205fde3fc 100644 --- a/client/src/app/site/modules/info/info.module.ts +++ b/client/src/app/site/modules/info/info.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatTooltipModule } from '@angular/material/tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/modules/site-wrapper/site-wrapper.module.ts b/client/src/app/site/modules/site-wrapper/site-wrapper.module.ts index d1fa68b67b..855c7bee0e 100644 --- a/client/src/app/site/modules/site-wrapper/site-wrapper.module.ts +++ b/client/src/app/site/modules/site-wrapper/site-wrapper.module.ts @@ -1,8 +1,8 @@ import { PortalModule } from '@angular/cdk/portal'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { RouterModule } from '@angular/router'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/modules/user-components/user-components.module.ts b/client/src/app/site/modules/user-components/user-components.module.ts index 5a3d0f057d..bb2112a433 100644 --- a/client/src/app/site/modules/user-components/user-components.module.ts +++ b/client/src/app/site/modules/user-components/user-components.module.ts @@ -2,13 +2,13 @@ import { ScrollingModule } from '@angular/cdk/scrolling'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatSelectModule } from '@angular/material/select'; diff --git a/client/src/app/site/modules/wait-for-action-dialog/wait-for-action-dialog.module.ts b/client/src/app/site/modules/wait-for-action-dialog/wait-for-action-dialog.module.ts index feb28edf5d..da785778bd 100644 --- a/client/src/app/site/modules/wait-for-action-dialog/wait-for-action-dialog.module.ts +++ b/client/src/app/site/modules/wait-for-action-dialog/wait-for-action-dialog.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from '../translations'; import { StoppedWaitingForActionDialogComponent } from './components/stopped-waiting-for-action-dialog/stopped-waiting-for-action-dialog.component'; diff --git a/client/src/app/site/pages/error/error.module.ts b/client/src/app/site/pages/error/error.module.ts index ce319ceff6..176aad3cdf 100644 --- a/client/src/app/site/pages/error/error.module.ts +++ b/client/src/app/site/pages/error/error.module.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatButtonModule } from '@angular/material/button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ErrorMainComponent } from './components/error-main/error-main.component'; diff --git a/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts b/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts index 7f10422add..d46e129b18 100644 --- a/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts +++ b/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts @@ -1,12 +1,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; import { SpinnerModule } from 'src/app/ui/modules/spinner'; diff --git a/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts b/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts index c546e00bda..34bb9fad45 100644 --- a/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts +++ b/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ResetPasswordConfirmComponent } from './components/reset-password-confirm/reset-password-confirm.component'; diff --git a/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts b/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts index 0f994ff391..4ad10b8a12 100644 --- a/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts +++ b/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts index 4ac641f3ea..3cd6ebdad0 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts @@ -1,13 +1,13 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDialogModule } from '@angular/material/dialog'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTableModule } from '@angular/material/table'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts index 4104351cb2..513b73dec3 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/speaker-user-select-dialog.module.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/speaker-user-select-dialog.module.ts index b9cb159b55..30f479ca12 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/speaker-user-select-dialog.module.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/speaker-user-select-dialog.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts index 5d0ef35603..c84f2e98aa 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; import { MediaUploadContentModule } from 'src/app/ui/modules/media-upload-content/media-upload-content.module'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.scss b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.scss index 1d1aadfca8..7cc20ebf95 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.scss +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.scss @@ -13,7 +13,7 @@ .selector { width: 95%; } - .mat-icon-button { + .mat-mdc-icon-button { top: 10px; } } diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/projection-dialog.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/projection-dialog.module.ts index 1bfa169c87..4b7d1b839f 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/projection-dialog.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/projection-dialog.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatRadioModule } from '@angular/material/radio'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.scss b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.scss index 6e1d1edebf..7d739b03f5 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.scss +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.scss @@ -1,8 +1,3 @@ -.mat-mini-fab.projector-inactive { - background: #fff !important; - color: #303030 !important; -} - .blend-in { display: inherit; } diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module.ts index d2545ca8fa..e6688109db 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/speaker-button.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/speaker-button.module.ts index 1512cadfe9..01197b686a 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/speaker-button.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/speaker-button.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatBadgeModule } from '@angular/material/badge'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts index bb0a3d6c8a..6d6b11f737 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts @@ -1,13 +1,13 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatSelectModule } from '@angular/material/select'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-sort/components/agenda-sort/agenda-sort.component.scss b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-sort/components/agenda-sort/agenda-sort.component.scss index 3d2d705396..d91f0dd12e 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-sort/components/agenda-sort/agenda-sort.component.scss +++ b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-sort/components/agenda-sort/agenda-sort.component.scss @@ -27,7 +27,7 @@ .sort-drawer-content { text-align: left; - .mat-button { + .mat-mdc-button { margin-left: 8px; } diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts index 31b1d6393f..70d5b9c190 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts @@ -1,13 +1,13 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; diff --git a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/chat-group-dialog.module.ts b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/chat-group-dialog.module.ts index 08aec0437e..d4d769bb21 100644 --- a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/chat-group-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/chat-group-dialog.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; diff --git a/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/chat-group-list.module.ts b/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/chat-group-list.module.ts index b9c2e885c7..f435dcdb6c 100644 --- a/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/chat-group-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/chat-group-list.module.ts @@ -3,11 +3,11 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatBadgeModule } from '@angular/material/badge'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/interaction/modules/action-bar/action-bar.module.ts b/client/src/app/site/pages/meetings/pages/interaction/modules/action-bar/action-bar.module.ts index 38b859fceb..31381ad678 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/modules/action-bar/action-bar.module.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/modules/action-bar/action-bar.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatBadgeModule } from '@angular/material/badge'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/interaction/modules/action-bar/components/action-bar/action-bar.component.scss b/client/src/app/site/pages/meetings/pages/interaction/modules/action-bar/components/action-bar/action-bar.component.scss index dd861735c0..84581f2336 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/modules/action-bar/components/action-bar/action-bar.component.scss +++ b/client/src/app/site/pages/meetings/pages/interaction/modules/action-bar/components/action-bar/action-bar.component.scss @@ -11,7 +11,7 @@ box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.5) !important; } -.mat-button-base { +.mat-mdc-button-base { margin-left: 0.5em; margin-bottom: 0.5em; } diff --git a/client/src/app/site/pages/meetings/pages/interaction/modules/interaction-container/interaction-container.module.ts b/client/src/app/site/pages/meetings/pages/interaction/modules/interaction-container/interaction-container.module.ts index 62feab1447..c223afda11 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/modules/interaction-container/interaction-container.module.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/modules/interaction-container/interaction-container.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatTooltipModule } from '@angular/material/tooltip'; import { NgParticlesModule } from 'ng-particles'; diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-export-dialog/components/motion-export-dialog/motion-export-dialog.component.scss b/client/src/app/site/pages/meetings/pages/motions/components/motion-export-dialog/components/motion-export-dialog/motion-export-dialog.component.scss index 50a0f0aa74..f779be64cc 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-export-dialog/components/motion-export-dialog/motion-export-dialog.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-export-dialog/components/motion-export-dialog/motion-export-dialog.component.scss @@ -6,8 +6,10 @@ h1 { margin: 0; } - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ mat-button-toggle { + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ .mat-button-toggle-label-content { line-height: 2.5; padding: 0 10px; diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-export-dialog/motion-export-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-export-dialog/motion-export-dialog.module.ts index 17bbea71e2..6052b1fac0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-export-dialog/motion-export-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-export-dialog/motion-export-dialog.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatDialogModule } from '@angular/material/dialog'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/motion-forward-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/motion-forward-dialog.module.ts index 8e2291ca4e..418135ebe7 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/motion-forward-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/motion-forward-dialog.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { IconContainerModule } from 'src/app/ui/modules/icon-container'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts index 051c2d3510..8d5802ba04 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts @@ -1,13 +1,13 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts index a15b465a3e..a1f4a9e7fb 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { AgendaContentObjectFormModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts index 2b344b39f0..9a134f6b20 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail-diff-summary/motion-detail-diff-summary.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail-diff-summary/motion-detail-diff-summary.component.scss index 182ff4d1cc..aaf89b7586 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail-diff-summary/motion-detail-diff-summary.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail-diff-summary/motion-detail-diff-summary.component.scss @@ -36,7 +36,7 @@ height: 24px !important; width: 24px !important; line-height: 24px !important; - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ .mat-button-wrapper { vertical-align: top; line-height: initial; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts index 03f23a038a..12b05e2097 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatRadioModule } from '@angular/material/radio'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.scss index 950a86d632..c6ad93969e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.scss @@ -5,6 +5,7 @@ // Determine the distance between the top edge to the start of the table content $text-margin-top: 10px; +/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version.*/ .mat-button-toggle-group { line-height: normal; vertical-align: middle; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts index dd3b056229..834e9d1ecf 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/motion-list.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/motion-list.module.ts index 6527a85370..b91eec2d6d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/motion-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/motion-list.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatBadgeModule } from '@angular/material/badge'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts index d452184dfe..6411bc1341 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts @@ -1,11 +1,11 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { HeadBarModule } from 'src/app/ui/modules/head-bar'; import { ListModule } from 'src/app/ui/modules/list'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts index 34d2eb5b2a..b8c19ef694 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/structure-level.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/structure-level.module.ts index fb254e28b2..9133e49631 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/structure-level.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/structure-level.module.ts @@ -1,13 +1,13 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts index 74d64462ee..f2c6a43790 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ProjectorCountdownDialogComponent } from './components/projector-countdown-dialog/projector-countdown-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts index 4362151d25..27eb26f2f1 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts @@ -1,12 +1,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/projector-message-dialog.module.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/projector-message-dialog.module.ts index c57833d576..532e9186ad 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/projector-message-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/projector-message-dialog.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { EditorModule } from 'src/app/ui/modules/editor'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.scss b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.scss index 0046578a60..64c2c2fd3b 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.scss +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.scss @@ -1,10 +1,5 @@ @import 'src/assets/styles/drag.scss'; -.projector-inactive { - color: #303030 !important; - background-color: white !important; -} - .projector-detail-wrapper { #projector { border: 1px solid lightgrey; diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/projector-detail.module.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/projector-detail.module.ts index d7a83ca648..589bfa2397 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/projector-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/projector-detail.module.ts @@ -1,10 +1,10 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts index f2f480f38f..6713380eaa 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts b/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts index 396499a45c..3d4f1beb06 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts @@ -1,11 +1,11 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatBadgeModule } from '@angular/material/badge'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-view/committee-detail-view.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-view/committee-detail-view.module.ts index 8a2c7fc8e6..c7503889e6 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-view/committee-detail-view.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-view/committee-detail-view.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { RouterModule } from '@angular/router'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/committee-list.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/committee-list.module.ts index deef54a813..eca6dc5777 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/committee-list.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/committee-list.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/dashboard-detail.module.ts b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/dashboard-detail.module.ts index a5c3b3b8ec..102aefca06 100644 --- a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/dashboard-detail.module.ts +++ b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/dashboard-detail.module.ts @@ -1,10 +1,10 @@ import { ScrollingModule } from '@angular/cdk/scrolling'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatTooltipModule } from '@angular/material/tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/organization/pages/designs/designs.module.ts b/client/src/app/site/pages/organization/pages/designs/designs.module.ts index 28cd12704c..8022872493 100644 --- a/client/src/app/site/pages/organization/pages/designs/designs.module.ts +++ b/client/src/app/site/pages/organization/pages/designs/designs.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts index 201f62254a..d0fbd501d8 100644 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts +++ b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts @@ -1,11 +1,11 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ColorFormFieldModule } from 'src/app/ui/modules/color-form-field/color-form-field.module'; diff --git a/client/src/app/site/pages/organization/pages/designs/pages/theme-list/theme-list.module.ts b/client/src/app/site/pages/organization/pages/designs/pages/theme-list/theme-list.module.ts index 3e97b621fc..40333e9497 100644 --- a/client/src/app/site/pages/organization/pages/designs/pages/theme-list/theme-list.module.ts +++ b/client/src/app/site/pages/organization/pages/designs/pages/theme-list/theme-list.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/meeting-list.module.ts b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/meeting-list.module.ts index c79d777800..f7828ef657 100644 --- a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/meeting-list.module.ts +++ b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/meeting-list.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts index 9fa52cbd2d..4b9a9eb00f 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts @@ -1,11 +1,11 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatTooltipModule } from '@angular/material/tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/organization-tag-list.module.ts b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/organization-tag-list.module.ts index b630e75082..be1e5ad59d 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/organization-tag-list.module.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/organization-tag-list.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ChipModule } from 'src/app/ui/modules/chip'; diff --git a/client/src/app/ui/modules/action-card/components/action-card/action-card.component.scss b/client/src/app/ui/modules/action-card/components/action-card/action-card.component.scss index fa42d705b9..3a7fd92509 100644 --- a/client/src/app/ui/modules/action-card/components/action-card/action-card.component.scss +++ b/client/src/app/ui/modules/action-card/components/action-card/action-card.component.scss @@ -3,7 +3,7 @@ margin: 20px 0; min-width: 200px; - .mat-icon-button mat-icon { + .mat-mdc-icon-button mat-icon { font-size: 18px; } /* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version.*/ diff --git a/client/src/app/ui/modules/choice-dialog/choice-dialog.module.ts b/client/src/app/ui/modules/choice-dialog/choice-dialog.module.ts index 0454de0af6..5239e626e3 100644 --- a/client/src/app/ui/modules/choice-dialog/choice-dialog.module.ts +++ b/client/src/app/ui/modules/choice-dialog/choice-dialog.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; diff --git a/client/src/app/ui/modules/color-form-field/color-form-field.module.ts b/client/src/app/ui/modules/color-form-field/color-form-field.module.ts index 0abc0937b1..c14e0c3361 100644 --- a/client/src/app/ui/modules/color-form-field/color-form-field.module.ts +++ b/client/src/app/ui/modules/color-form-field/color-form-field.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatTooltipModule } from '@angular/material/tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/ui/modules/datepicker/datepicker.module.ts b/client/src/app/ui/modules/datepicker/datepicker.module.ts index 6adaa7f6b5..856fb58af5 100644 --- a/client/src/app/ui/modules/datepicker/datepicker.module.ts +++ b/client/src/app/ui/modules/datepicker/datepicker.module.ts @@ -1,11 +1,11 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DatepickerComponent } from './components/datepicker/datepicker.component'; diff --git a/client/src/app/ui/modules/file-list/components/file-list/file-list.component.scss b/client/src/app/ui/modules/file-list/components/file-list/file-list.component.scss index 8aae3cd16a..29113b3417 100644 --- a/client/src/app/ui/modules/file-list/components/file-list/file-list.component.scss +++ b/client/src/app/ui/modules/file-list/components/file-list/file-list.component.scss @@ -12,7 +12,7 @@ $navbar-size: 40px; white-space: nowrap; display: flex; - .mat-button { + .mat-mdc-button { padding: 0; } } diff --git a/client/src/app/ui/modules/file-list/file-list.module.ts b/client/src/app/ui/modules/file-list/file-list.module.ts index 4c539780e0..5f89bb51b8 100644 --- a/client/src/app/ui/modules/file-list/file-list.module.ts +++ b/client/src/app/ui/modules/file-list/file-list.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/ui/modules/file-upload/file-upload.module.ts b/client/src/app/ui/modules/file-upload/file-upload.module.ts index 0dc76ba2d7..24cb4bd273 100644 --- a/client/src/app/ui/modules/file-upload/file-upload.module.ts +++ b/client/src/app/ui/modules/file-upload/file-upload.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatTooltipModule } from '@angular/material/tooltip'; import { NgxFileDropModule } from 'ngx-file-drop'; diff --git a/client/src/app/ui/modules/head-bar/head-bar.module.ts b/client/src/app/ui/modules/head-bar/head-bar.module.ts index e797323faa..1751e23e8b 100644 --- a/client/src/app/ui/modules/head-bar/head-bar.module.ts +++ b/client/src/app/ui/modules/head-bar/head-bar.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/client/src/app/ui/modules/import-list/import-list.module.ts b/client/src/app/ui/modules/import-list/import-list.module.ts index 72150c843f..4657d9c0d7 100644 --- a/client/src/app/ui/modules/import-list/import-list.module.ts +++ b/client/src/app/ui/modules/import-list/import-list.module.ts @@ -2,10 +2,10 @@ import { PortalModule } from '@angular/cdk/portal'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatSelectModule } from '@angular/material/select'; import { MatTabsModule } from '@angular/material/tabs'; diff --git a/client/src/app/ui/modules/input/input.module.ts b/client/src/app/ui/modules/input/input.module.ts index 7fe5886525..c5e38df83b 100644 --- a/client/src/app/ui/modules/input/input.module.ts +++ b/client/src/app/ui/modules/input/input.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { RoundedInputComponent } from './components/rounded-input/rounded-input.component'; diff --git a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.scss b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.scss index e450ecdd48..70a5c06706 100644 --- a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.scss +++ b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.scss @@ -5,7 +5,7 @@ os-sort-filter-bar { .filter-menu-head { padding-left: 5px; - .mat-button { + .mat-mdc-button { margin: 0 auto; } } diff --git a/client/src/app/ui/modules/list/list.module.ts b/client/src/app/ui/modules/list/list.module.ts index 944f0358c4..9facec5be3 100644 --- a/client/src/app/ui/modules/list/list.module.ts +++ b/client/src/app/ui/modules/list/list.module.ts @@ -4,10 +4,10 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatBadgeModule } from '@angular/material/badge'; import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; +import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; diff --git a/client/src/app/ui/modules/prompt-dialog/prompt-dialog.module.ts b/client/src/app/ui/modules/prompt-dialog/prompt-dialog.module.ts index 26fb5c20c0..4cad2787e5 100644 --- a/client/src/app/ui/modules/prompt-dialog/prompt-dialog.module.ts +++ b/client/src/app/ui/modules/prompt-dialog/prompt-dialog.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from '../../../site/modules/translations'; import { PromptDialogComponent } from './components/prompt-dialog/prompt-dialog.component'; diff --git a/client/src/app/ui/modules/search-selector/search-selector.module.ts b/client/src/app/ui/modules/search-selector/search-selector.module.ts index 9abec9ad79..814c0f3b11 100644 --- a/client/src/app/ui/modules/search-selector/search-selector.module.ts +++ b/client/src/app/ui/modules/search-selector/search-selector.module.ts @@ -2,8 +2,8 @@ import { ScrollingModule } from '@angular/cdk/scrolling'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/c4-dialog.module.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/c4-dialog.module.ts index 1d63caecc1..20a43bfee5 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/c4-dialog.module.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/c4-dialog.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { C4DialogComponent } from './components/c4-dialog/c4-dialog.component'; diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/chess-dialog.module.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/chess-dialog.module.ts index 3cee0617e5..2925de490d 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/chess-dialog.module.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/chess-dialog.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { PromptDialogModule, PromptService } from 'src/app/ui/modules/prompt-dialog'; diff --git a/client/src/app/ui/modules/sidenav/sidenav.module.ts b/client/src/app/ui/modules/sidenav/sidenav.module.ts index ee524b0ae9..36ca1086b2 100644 --- a/client/src/app/ui/modules/sidenav/sidenav.module.ts +++ b/client/src/app/ui/modules/sidenav/sidenav.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatSidenavModule } from '@angular/material/sidenav'; diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.scss b/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.scss index 87b8031899..a0b16a44c5 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.scss +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.scss @@ -35,7 +35,7 @@ cdk-tree-node { 0 3px 14px 2px rgba(0, 0, 0, 0.12); } - .mat-icon-button { + .mat-mdc-icon-button { visibility: hidden !important; } } diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/sorting-tree.module.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/sorting-tree.module.ts index 197b4a8c16..52cf8af623 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/sorting-tree.module.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/sorting-tree.module.ts @@ -2,8 +2,8 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { CdkTreeModule } from '@angular/cdk/tree'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { SortingTreeComponent } from './components/sorting-tree/sorting-tree.component'; diff --git a/client/src/assets/styles/global-components-style.scss b/client/src/assets/styles/global-components-style.scss index 339c0c290f..b1df307b07 100644 --- a/client/src/assets/styles/global-components-style.scss +++ b/client/src/assets/styles/global-components-style.scss @@ -60,7 +60,7 @@ .fake-disabled { background: mat.get-color-from-palette($background, unselected-chip) !important; opacity: 1 !important; - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version.*/ .mat-button-wrapper { .mat-icon { color: mat.get-color-from-palette($foreground, disabled-button) !important; diff --git a/client/src/assets/styles/material/icon.scss b/client/src/assets/styles/material/icon.scss index 529484c6fe..e645f0b129 100644 --- a/client/src/assets/styles/material/icon.scss +++ b/client/src/assets/styles/material/icon.scss @@ -12,7 +12,7 @@ mat-icon { vertical-align: bottom; } - .mat-icon-button, + .mat-mdc-icon-button, .mat-icon { margin: auto 0; vertical-align: middle; diff --git a/client/src/assets/styles/typography.scss b/client/src/assets/styles/typography.scss index c4df95eeef..38d4e3aefc 100644 --- a/client/src/assets/styles/typography.scss +++ b/client/src/assets/styles/typography.scss @@ -37,7 +37,7 @@ h4 { font-size: 100%; margin-bottom: 5px; - .mat-icon-button mat-icon { + .mat-mdc-icon-button mat-icon { font-size: 16px; } } diff --git a/client/src/styles.scss b/client/src/styles.scss index 49e177aacd..716ac948f5 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -180,7 +180,7 @@ button.mat-menu-item.selected { margin-right: 8px !important; } -.mat-mini-fab.large { +.mat-mdc-mini-fab.large { width: 24px; height: 24px; line-height: 24px;