Skip to content

Commit

Permalink
feat(material): update to v12
Browse files Browse the repository at this point in the history
  • Loading branch information
kKen94 committed Aug 7, 2021
1 parent 1dc3d54 commit 46c0ce1
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 83 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
"private": true,
"dependencies": {
"@angular/animations": "~12.2.0",
"@angular/cdk": "~11.1.0",
"@angular/cdk": "~12.2.0",
"@angular/common": "~12.2.0",
"@angular/compiler": "~12.2.0",
"@angular/core": "~12.2.0",
"@angular/flex-layout": "^12.0.0-beta.34",
"@angular/forms": "~12.2.0",
"@angular/material": "^11.1.0",
"@angular/material": "^12.2.0",
"@angular/platform-browser": "~12.2.0",
"@angular/platform-browser-dynamic": "~12.2.0",
"@angular/router": "~12.2.0",
Expand Down Expand Up @@ -87,4 +87,4 @@
"type": "git",
"url": "https://github.com/kKen94/ngx-progress.git"
}
}
}
141 changes: 71 additions & 70 deletions projects/demo/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,70 +1,71 @@
@import url('https://fonts.googleapis.com/css?family=Open+Sans');
@import '~@angular/material/theming';
// Plus imports for other components in your app.

// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
@include mat-core();

// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://material.io/design/color/
$candy-app-primary: mat-palette($mat-blue, 400);
$candy-app-accent: mat-palette($mat-pink, A200, A100, A400);

// The warn palette is optional (defaults to red).
$candy-app-warn: mat-palette($mat-red);

// Create the theme object. A theme consists of configurations for individual
// theming systems such as `color` or `typography`.
$candy-app-theme: mat-light-theme(
(
color: (
primary: $candy-app-primary,
accent: $candy-app-accent,
warn: $candy-app-warn,
)
)
);

// Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component
// that you are using.
@include angular-material-theme($candy-app-theme);

html {
height: 100%;
width: 100%;
font-family: Arial, sans-serif;
font-size: 16px;
background: #f7d794;
margin: 0;
}

body {
height: 100%;
width: 100%;
margin: 0;
overflow: hidden;
}

a,
p,
span {
color: #262626;
text-decoration: none !important;
}

.mat-slider-min-value.mat-slider-thumb-label-showing .mat-slider-thumb,
.mat-slider-min-value.mat-slider-thumb-label-showing .mat-slider-thumb-label {
background-color: #ff4081 !important;
}

.mat-form-field-infix {
width: 40px !important;
}

color-block-swatches {
display: none !important;
}
@use '~@angular/material' as mat;
@import url('https://fonts.googleapis.com/css?family=Open+Sans');
@import '~@angular/material/theming';
// Plus imports for other components in your app.

// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
@include mat.core();

// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://material.io/design/color/
$candy-app-primary: mat.define-palette(mat.$blue-palette, 400);
$candy-app-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);

// The warn palette is optional (defaults to red).
$candy-app-warn: mat.define-palette(mat.$red-palette);

// Create the theme object. A theme consists of configurations for individual
// theming systems such as `color` or `typography`.
$candy-app-theme: mat.define-light-theme(
(
color: (
primary: $candy-app-primary,
accent: $candy-app-accent,
warn: $candy-app-warn,
)
)
);

// Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component
// that you are using.
@include mat.all-component-themes($candy-app-theme);

html {
height: 100%;
width: 100%;
font-family: Arial, sans-serif;
font-size: 16px;
background: #f7d794;
margin: 0;
}

body {
height: 100%;
width: 100%;
margin: 0;
overflow: hidden;
}

a,
p,
span {
color: #262626;
text-decoration: none !important;
}

.mat-slider-min-value.mat-slider-thumb-label-showing .mat-slider-thumb,
.mat-slider-min-value.mat-slider-thumb-label-showing .mat-slider-thumb-label {
background-color: #ff4081 !important;
}

.mat-form-field-infix {
width: 40px !important;
}

color-block-swatches {
display: none !important;
}
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@
dependencies:
tslib "^2.2.0"

"@angular/cdk@~11.1.0":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.1.2.tgz#89708a97be340bbfb7d64c84dbc7bb100f77d7ff"
integrity sha512-RnKvMWAIcWbWoUdBfAoOs4pQl6t5O+1OuPlBNK5aL2FYqoLv5U0fP88Rf7OhjPlD0ASsPGLG45t+dA5sUVZ46Q==
"@angular/cdk@~12.2.0":
version "12.2.0"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.2.0.tgz#7c6de53522ef7cf911d86e187f3df2a90e8fee49"
integrity sha512-Dts+KIMz6EdzQxaWBFcNwgWAHVPkI5pnOGMidKKVOmjezSUN6mhfBKq8emgsddJMRAqz/1VHMAEaRkp0VoBKiA==
dependencies:
tslib "^2.0.0"
tslib "^2.2.0"
optionalDependencies:
parse5 "^5.0.0"

Expand Down Expand Up @@ -242,12 +242,12 @@
resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-12.2.0.tgz#f863fa6f586e28b8fcb3024fff70ddae534d3ab2"
integrity sha512-oWZ3E+640iRxkf+tStNpDbJT4mc7zNdOCg4L0YjpBuDOiStJ0YDgtJfNdYE+Ap7fsb0QvUuXpU0QGnDVazQ1PQ==

"@angular/material@^11.1.0":
version "11.2.13"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.2.13.tgz#99960316d3ce58aac7497d7bb8b0c05468f502b9"
integrity sha512-FqFdGSkOtqsmeLyTSousodDGUy2NqbtxCIKv2rwbsIRwHNKB0KpR/UQhA2gMRuGa5hxhMJ0DW0Tf9neMRuLCTg==
"@angular/material@^12.2.0":
version "12.2.0"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-12.2.0.tgz#a88c8c8177327a5131920b9d6ff1413784baeb53"
integrity sha512-onrWWoukVDt+lBRFLAaw9JFjncGMKGBPRq0VyT/ppl6tfw3+l/AiQsUd9lzpFmZfkH6PZZwv97k/5eu+6Y8jdg==
dependencies:
tslib "^2.0.0"
tslib "^2.2.0"

"@angular/platform-browser-dynamic@~12.2.0":
version "12.2.0"
Expand Down

0 comments on commit 46c0ce1

Please sign in to comment.