cargdev/angular
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

build(aio): upgrade to CLI beta.32 and MD beta.2

Browse Source
This commit is contained in:
Ward Bell
2017-02-20 19:05:40 -08:00
committed by Igor Minar
parent a26eb4c04e
commit 9a2ea55bff
15 changed files with 648 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
aio/src/styles/_typography-theme.scss
View File

@ -10,16 +10,16 @@
.docs-component-viewer-tabbed-content,
.docs-guide-content {
h1 {
color: md-color($primary, 800);
background: rgba(md-color($foreground, secondary-text), .03);
color: mat-color($primary, 800);
background: rgba(mat-color($foreground, secondary-text), .03);
}
h3, h2, h4, h5, p, ol, li{
color: md-color($foreground, secondary-text);
color: mat-color($foreground, secondary-text);
}
a {
color: md-color($primary);
color: mat-color($primary);
}
table {
@ -27,17 +27,17 @@
}
table tbody th{
border: 1px solid rgba(md-color($foreground, secondary-text), .03);
border: 1px solid rgba(mat-color($foreground, secondary-text), .03);
}
td {
color: md-color($foreground, secondary-text);
border: 1px solid rgba(md-color($foreground, secondary-text), .03);
color: mat-color($foreground, secondary-text);
border: 1px solid rgba(mat-color($foreground, secondary-text), .03);
}
th {
color: md-color($foreground, secondary-text);
background: rgba(md-color($foreground, secondary-text), .03);
color: mat-color($foreground, secondary-text);
background: rgba(mat-color($foreground, secondary-text), .03);
}
}
}

2
aio/src/styles/_typography.scss
View File

@ -23,7 +23,7 @@
font-size: 16px;
}
.md-tab-body-wrapper h2 {
.mat-tab-body-wrapper h2 {
margin-top: 0px;
}

10
aio/src/styles/main.scss
View File

@ -4,15 +4,15 @@
// Include material core styles.
@include md-core();
@include mat-core();
@include docs-site-typography();
// Define the light theme.
$primary: md-palette($md-cyan);
$accent: md-palette($md-amber, A200, A100, A400);
$primary: mat-palette($mat-cyan);
$accent: mat-palette($mat-amber, A200, A100, A400);
$theme: md-light-theme($primary, $accent);
$theme: mat-light-theme($primary, $accent);
@include angular-material-theme($theme);
body {
@ -20,7 +20,7 @@ body {
margin: 0;
}
[md-button], [md-raised-button] {
[md-button], [md-raised-button], [mat-button], [mat-raised-button] {
text-transform: uppercase;
}

10
aio/src/styles/ng-io-theme.scss
View File

@ -3,20 +3,20 @@
// Include the base styles for Angular Material core. We include this here so that you only
// have to load a single css file for Angular Material in your app.
@include md-core();
@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.
$ng-io-primary: md-palette($md-indigo);
$ng-io-accent: md-palette($md-pink, A200, A100, A400);
$ng-io-primary: mat-palette($mat-indigo);
$ng-io-accent: mat-palette($mat-pink, A200, A100, A400);
// The warn palette is optional (defaults to red).
$ng-io-warn: md-palette($md-red);
$ng-io-warn: mat-palette($mat-red);
// Create the theme object (a Sass map containing all of the palettes).
$ng-io-theme: md-light-theme($ng-io-primary, $ng-io-accent, $ng-io-warn);
$ng-io-theme: mat-light-theme($ng-io-primary, $ng-io-accent, $ng-io-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