Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RED-5875: migrate menus

Browse Source
This commit is contained in:
Dan Percic 2023-05-17 13:36:16 +03:00
parent ba4d7f6d05
commit 2868ebe506
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/assets/styles/common-menu.scss
View File

@ -1,6 +1,6 @@
@use 'common-mixins'; @use 'common-mixins';
.mat-menu-panel { .mat-mdc-menu-panel {
border-radius: var(--iqser-menu-border-radius) !important; border-radius: var(--iqser-menu-border-radius) !important;
max-width: none !important; max-width: none !important;
min-width: 180px !important; min-width: 180px !important;
@ -10,20 +10,20 @@
@include common-mixins.scroll-bar; @include common-mixins.scroll-bar;
@include common-mixins.drop-shadow; @include common-mixins.drop-shadow;
.mat-menu-content:not(:empty) { .mat-mdc-menu-content:not(:empty) {
padding-top: var(--iqser-menu-padding-top); padding-top: var(--iqser-menu-padding-top);
padding-bottom: var(--iqser-menu-padding-bottom); padding-bottom: var(--iqser-menu-padding-bottom);
} }
&.padding-bottom-0 .mat-menu-content:not(:empty) { &.padding-bottom-0 .mat-mdc-menu-content:not(:empty) {
padding-bottom: 0; padding-bottom: 0;
} }
&.padding-bottom-8 .mat-menu-content:not(:empty) { &.padding-bottom-8 .mat-mdc-menu-content:not(:empty) {
padding-bottom: 8px; padding-bottom: 8px;
} }
.mat-menu-item { .mat-mdc-menu-item {
font-size: var(--iqser-font-size); font-size: var(--iqser-font-size);
color: var(--iqser-text); color: var(--iqser-text);
padding: 0 26px 0 8px; padding: 0 26px 0 8px;

6
src/lib/filtering/filters.module.ts
View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatMenuModule } from '@angular/material/menu';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { ChevronButtonComponent, IconButtonComponent } from '../buttons'; import { ChevronButtonComponent, IconButtonComponent } from '../buttons';
import { PopupFilterComponent } from './popup-filter/popup-filter.component'; import { PopupFilterComponent } from './popup-filter/popup-filter.component';
@ -13,7 +13,6 @@ import { MatIconModule } from '@angular/material/icon';
import { PreventDefaultDirective, StopPropagationDirective } from '../directives'; import { PreventDefaultDirective, StopPropagationDirective } from '../directives';
import { InputWithActionComponent } from '../inputs'; import { InputWithActionComponent } from '../inputs';
const matModules = [MatCheckboxModule, MatMenuModule];
const components = [QuickFiltersComponent, PopupFilterComponent, SingleFilterComponent, FilterCardComponent]; const components = [QuickFiltersComponent, PopupFilterComponent, SingleFilterComponent, FilterCardComponent];
@NgModule({ @NgModule({
@ -21,7 +20,8 @@ const components = [QuickFiltersComponent, PopupFilterComponent, SingleFilterCom
exports: [...components], exports: [...components],
imports: [ imports: [
CommonModule, CommonModule,
...matModules, MatCheckboxModule,
MatMenuModule,
TranslateModule, TranslateModule,
IqserHelpModeModule, IqserHelpModeModule,
IconButtonComponent, IconButtonComponent,