diff --git a/package-lock.json b/package-lock.json index 775868d..3378097 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,6 @@ "@angular/common": "^15.0.4", "@angular/compiler": "^15.0.4", "@angular/core": "^15.0.4", - "@angular/flex-layout": "^14.0.0-beta.41", "@angular/forms": "^15.0.4", "@angular/material": "^15.0.3", "@angular/platform-browser": "^15.0.4", @@ -1274,22 +1273,6 @@ "zone.js": "~0.11.4 || ~0.12.0" } }, - "node_modules/@angular/flex-layout": { - "version": "14.0.0-beta.41", - "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-14.0.0-beta.41.tgz", - "integrity": "sha512-x1YcxqkdFlcbVXEy9ebCgW/F+7n/MXkEkwEcVEIPf5v5qn7HZsjQxgIj35Lf0amvMyF7h35prpoxO1uX5+ntFg==", - "deprecated": "This package has been deprecated. Please see https://blog.angular.io/modern-css-in-angular-layouts-4a259dca9127", - "dependencies": { - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/cdk": "^14.0.0", - "@angular/common": "^14.0.0", - "@angular/core": "^14.0.0", - "@angular/platform-browser": "^14.0.0", - "rxjs": "^6.5.3 || ^7.4.0" - } - }, "node_modules/@angular/forms": { "version": "15.0.4", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.0.4.tgz", @@ -30177,14 +30160,6 @@ "tslib": "^2.3.0" } }, - "@angular/flex-layout": { - "version": "14.0.0-beta.41", - "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-14.0.0-beta.41.tgz", - "integrity": "sha512-x1YcxqkdFlcbVXEy9ebCgW/F+7n/MXkEkwEcVEIPf5v5qn7HZsjQxgIj35Lf0amvMyF7h35prpoxO1uX5+ntFg==", - "requires": { - "tslib": "^2.3.0" - } - }, "@angular/forms": { "version": "15.0.4", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.0.4.tgz", diff --git a/package.json b/package.json index 7825657..3486b24 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "@angular/common": "^15.0.4", "@angular/compiler": "^15.0.4", "@angular/core": "^15.0.4", - "@angular/flex-layout": "^14.0.0-beta.41", "@angular/forms": "^15.0.4", "@angular/material": "^15.0.3", "@angular/platform-browser": "^15.0.4", diff --git a/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.component.html b/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.component.html index 1887e79..77dadc6 100644 --- a/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.component.html +++ b/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.component.html @@ -1,18 +1,16 @@ -
-
- -
-
+
+ +
diff --git a/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.component.scss b/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.component.scss index c244b96..fb161cb 100644 --- a/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.component.scss +++ b/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.component.scss @@ -22,10 +22,20 @@ //display: flex; //flex-direction: column-reverse; //align-items: center; - margin-bottom: 5px; - button { - margin-bottom: 16px; - } + // Do not force the library user to define negative margin to align the button + //margin-bottom: 5px; + + // Do not add additional padding which results in different gap sizes depending upon the direction. + //button { + // margin-bottom: 16px; + //} } } + +.flexLayoutCenter { + display: flex; + place-content: center; + align-items: center; + gap: 16px; +} diff --git a/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.module.ts b/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.module.ts index 200ab77..65648f5 100644 --- a/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.module.ts +++ b/projects/angular-material-extensions/fab-menu/src/lib/mat-fab-menu.module.ts @@ -1,22 +1,14 @@ -import {NgModule} from '@angular/core'; -import {MatFabMenuComponent} from './mat-fab-menu.component'; -import {CommonModule} from '@angular/common'; -import {MatIconModule} from '@angular/material/icon'; -import {FlexLayoutModule} from '@angular/flex-layout'; -import {MatTooltipModule} from '@angular/material/tooltip'; -import {MatButtonModule} from '@angular/material/button'; -import {MatMiniFabMenuComponent} from './mat-mini-fab-menu/mat-mini-fab-menu.component'; +import { NgModule } from '@angular/core'; +import { MatFabMenuComponent } from './mat-fab-menu.component'; +import { CommonModule } from '@angular/common'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMiniFabMenuComponent } from './mat-mini-fab-menu/mat-mini-fab-menu.component'; @NgModule({ declarations: [MatFabMenuComponent, MatMiniFabMenuComponent], - imports: [ - CommonModule, - MatButtonModule, - MatIconModule, - MatTooltipModule, - FlexLayoutModule - ], - exports: [MatFabMenuComponent, MatMiniFabMenuComponent] + imports: [CommonModule, MatButtonModule, MatIconModule, MatTooltipModule], + exports: [MatFabMenuComponent, MatMiniFabMenuComponent], }) -export class MatFabMenuModule { -} +export class MatFabMenuModule {} diff --git a/projects/angular-material-extensions/fab-menu/src/lib/mat-mini-fab-menu/mat-mini-fab-menu.component.html b/projects/angular-material-extensions/fab-menu/src/lib/mat-mini-fab-menu/mat-mini-fab-menu.component.html index 59fafcd..234d506 100644 --- a/projects/angular-material-extensions/fab-menu/src/lib/mat-mini-fab-menu/mat-mini-fab-menu.component.html +++ b/projects/angular-material-extensions/fab-menu/src/lib/mat-mini-fab-menu/mat-mini-fab-menu.component.html @@ -1,18 +1,16 @@ -
-
- -
-
+
+ +
diff --git a/projects/angular-material-extensions/fab-menu/src/lib/mat-mini-fab-menu/mat-mini-fab-menu.component.scss b/projects/angular-material-extensions/fab-menu/src/lib/mat-mini-fab-menu/mat-mini-fab-menu.component.scss index c244b96..fb161cb 100644 --- a/projects/angular-material-extensions/fab-menu/src/lib/mat-mini-fab-menu/mat-mini-fab-menu.component.scss +++ b/projects/angular-material-extensions/fab-menu/src/lib/mat-mini-fab-menu/mat-mini-fab-menu.component.scss @@ -22,10 +22,20 @@ //display: flex; //flex-direction: column-reverse; //align-items: center; - margin-bottom: 5px; - button { - margin-bottom: 16px; - } + // Do not force the library user to define negative margin to align the button + //margin-bottom: 5px; + + // Do not add additional padding which results in different gap sizes depending upon the direction. + //button { + // margin-bottom: 16px; + //} } } + +.flexLayoutCenter { + display: flex; + place-content: center; + align-items: center; + gap: 16px; +} diff --git a/src/app/app.component.html b/src/app/app.component.html index ed575f8..0a050f1 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -435,7 +435,7 @@

Install

Usage

- +

Color: Usage

- Direction + Direction: + [(ngModel)]="direction"> Top Bottom Left Right

+

+ Button size: + + Normal + Mini + +

+

isActive

disabled

-
- + -