Skip to content

Commit

Permalink
chore: upgrade material and cdk to 13.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@nzbin
nzbin committed Dec 11, 2021
1 parent 4c50e94 commit 89e10b7
Show file tree
Hide file tree
Showing 32 changed files with 63 additions and 63 deletions.
24 changes: 12 additions & 12 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
"private": true,
"dependencies": {
"@angular/animations": "~13.1.0",
"@angular/cdk": "~12.2.13",
"@angular/cdk": "~13.1.0",
"@angular/common": "~13.1.0",
"@angular/compiler": "~13.1.0",
"@angular/core": "~13.1.0",
"@angular/flex-layout": "^12.0.0-beta.35",
"@angular/forms": "~13.1.0",
"@angular/localize": "~13.1.0",
"@angular/material": "~12.2.13",
"@angular/material-moment-adapter": "~12.2.13",
"@angular/material": "~13.1.0",
"@angular/material-moment-adapter": "~13.1.0",
"@angular/platform-browser": "~13.1.0",
"@angular/platform-browser-dynamic": "~13.1.0",
"@angular/router": "~13.1.0",
Expand Down
4 changes: 2 additions & 2 deletions projects/dev-app/src/styles.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '~@angular/material' as mat;
@use '~@angular/material/core/density/private/all-density' as private-all-density;
@use '@angular/material' as mat;
@use '@angular/material/core/density/private/all-density' as private-all-density;

@use '../../extensions' as mtx;

Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/app/pages/component-category-list/_component-category-list-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin theme($theme) {
$primary: map.get($theme, primary);
Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/app/pages/component-nav/_component-nav-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:map';
@use 'sass:color';
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin theme($theme) {
$primary: map.get($theme, primary);
Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/app/pages/component-page-header/_component-page-header-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin theme($theme) {
$primary: map.get($theme, primary);
Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/app/pages/component-viewer/_component-viewer-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin theme($theme) {
$primary: map.get($theme, primary);
Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/app/pages/homepage/_homepage-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin theme($theme) {
$primary: map.get($theme, primary);
Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/app/shared/example-viewer/_example-viewer-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin theme($theme) {
$primary: map.get($theme, primary);
Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/app/shared/navbar/_navbar-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin theme($theme) {
$primary: map.get($theme, primary);
Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/app/shared/table-of-contents/_table-of-contents-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin theme($theme) {
$primary: map.get($theme, primary);
Expand Down
2 changes: 1 addition & 1 deletion projects/docs/src/styles.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~@angular/material' as mat;
@use '@angular/material' as mat;
@use '../../extensions' as mtx;

@use './styles/app-theme';
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/_all-color.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~@angular/material/core/theming/theming';
@use '@angular/material/core/theming/theming';
@use './all-theme';

// Includes all of the color styles.
Expand Down
4 changes: 2 additions & 2 deletions projects/extensions/alert/_alert-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '~@angular/material/core/theming/palette';
@use '@angular/material/core/theming/theming';
@use '@angular/material/core/theming/palette';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
4 changes: 2 additions & 2 deletions projects/extensions/colorpicker/_colorpicker-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '~@angular/material/core/theming/palette';
@use '@angular/material/core/theming/theming';
@use '@angular/material/core/theming/palette';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
10 changes: 5 additions & 5 deletions projects/extensions/datetimepicker/_datetimepicker-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '~@angular/material/core/theming/palette';
@use '~@angular/material/core/style/private';
@use '~@angular/material/core/typography/typography';
@use '~@angular/material/core/typography/typography-utils';
@use '@angular/material/core/theming/theming';
@use '@angular/material/core/theming/palette';
@use '@angular/material/core/style/private';
@use '@angular/material/core/typography/typography';
@use '@angular/material/core/typography/typography-utils';

$selected-today-box-shadow-width: 1px;
$calendar-body-font-size: 13px !default;
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/datetimepicker/calendar-body.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~@angular/material/core/style/private';
@use '@angular/material/core/style/private';

$calendar-body-label-padding-start: 5% !default;
$calendar-body-label-side-padding: private.private-div(33%, 7) !default;
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/form-group/_form-group-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '@angular/material/core/theming/theming';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/grid/_grid-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '@angular/material/core/theming/theming';
@use './column-resize/column-resize';

@mixin color($config-or-theme) {
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/grid/column-menu.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

.mtx-grid-column-menu {
.mat-menu-content {
Expand Down
6 changes: 3 additions & 3 deletions projects/extensions/grid/column-resize/_column-resize.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use 'sass:map';
@use '~@angular/material/core/style/variables';
@use '~@angular/material/core/style/vendor-prefixes';
@use '~@angular/material/core/theming/theming';
@use '@angular/material/core/style/variables';
@use '@angular/material/core/style/vendor-prefixes';
@use '@angular/material/core/theming/theming';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/loader/_loader-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '@angular/material/core/theming/theming';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/popover/_popover-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '@angular/material/core/theming/theming';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
4 changes: 2 additions & 2 deletions projects/extensions/progress/_progress-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '~@angular/material/core/theming/palette';
@use '@angular/material/core/theming/theming';
@use '@angular/material/core/theming/palette';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/select/_select-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '@angular/material/core/theming/theming';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/select/select.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~@angular/material' as mat;
@use '@angular/material' as mat;

@mixin rtl {
@at-root [dir='rtl'] #{&} {
Expand Down
8 changes: 4 additions & 4 deletions projects/extensions/slider/_slider-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@use 'sass:map';
@use 'sass:meta';
@use '~@angular/material/core/theming/theming';
@use '~@angular/material/core/style/private';
@use '~@angular/material/core/typography/typography';
@use '~@angular/material/core/typography/typography-utils';
@use '@angular/material/core/theming/theming';
@use '@angular/material/core/style/private';
@use '@angular/material/core/typography/typography';
@use '@angular/material/core/typography/typography-utils';

@mixin _inner-content-theme($palette) {
.mtx-slider-track-fill,
Expand Down
6 changes: 3 additions & 3 deletions projects/extensions/slider/slider.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use 'sass:math';
@use '~@angular/material/core/style/variables';
@use '~@angular/material/core/style/vendor-prefixes';
@use '~@angular/cdk/a11y';
@use '@angular/material/core/style/variables';
@use '@angular/material/core/style/vendor-prefixes';
@use '@angular/cdk/a11y';

// This refers to the thickness of the slider. On a horizontal slider this is the height, on a
// vertical slider this is the width.
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/split/_split-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '@angular/material/core/theming/theming';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
4 changes: 2 additions & 2 deletions projects/extensions/text3d/_text3d-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '~@angular/material/core/theming/palette';
@use '@angular/material/core/theming/theming';
@use '@angular/material/core/theming/palette';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
Expand Down
6 changes: 3 additions & 3 deletions projects/extensions/tooltip/_tooltip-theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use 'sass:map';
@use '~@angular/material/core/theming/theming';
@use '~@angular/material/core/typography/typography';
@use '~@angular/material/core/typography/typography-utils';
@use '@angular/material/core/theming/theming';
@use '@angular/material/core/typography/typography';
@use '@angular/material/core/typography/typography-utils';

$target-height: 22px;
$font-size: 12px;
Expand Down
2 changes: 1 addition & 1 deletion projects/extensions/tooltip/tooltip.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '~@angular/cdk' as cdk;
@use '@angular/cdk' as cdk;

$mtx-tooltip-horizontal-padding: 8px;
$mtx-tooltip-max-width: 250px;
Expand Down

0 comments on commit 89e10b7

Please sign in to comment.