diff --git a/src/universal-app/index.html b/src/universal-app/index.html index 9f87ed71a7f..5a2433c6d30 100644 --- a/src/universal-app/index.html +++ b/src/universal-app/index.html @@ -2,7 +2,11 @@ + Angular Material Universal Kitchen Sink Test + + + diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html index 0bd7e407a60..3078600f22a 100644 --- a/src/universal-app/kitchen-sink/kitchen-sink.html +++ b/src/universal-app/kitchen-sink/kitchen-sink.html @@ -10,16 +10,16 @@

Button

- + - - + + Google -Google +search Google -Google -Google +home +favorite

Button toggle

@@ -107,7 +107,7 @@

Icon

-ligature +grade

Input

@@ -361,6 +361,6 @@

Badge

- diff --git a/src/universal-app/theme.scss b/src/universal-app/theme.scss new file mode 100644 index 00000000000..9034a7ce67e --- /dev/null +++ b/src/universal-app/theme.scss @@ -0,0 +1,16 @@ +@import '../lib/core/theming/all-theme'; + +// 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 default theme (same as the example above). +$candy-app-primary: mat-palette($mat-indigo); +$candy-app-accent: mat-palette($mat-pink, A200, A100, A400); +$candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent); + +// Include the default theme styles. +@include angular-material-theme($candy-app-theme); diff --git a/tools/gulp/tasks/universal.ts b/tools/gulp/tasks/universal.ts index 591d2c51030..c866d4383eb 100644 --- a/tools/gulp/tasks/universal.ts +++ b/tools/gulp/tasks/universal.ts @@ -1,8 +1,8 @@ -import {task} from 'gulp'; +import {dest, task} from 'gulp'; import {ngcBuildTask, tsBuildTask, copyTask, execTask} from '../util/task_helpers'; import {join} from 'path'; import {copySync} from 'fs-extra'; -import {buildConfig, sequenceTask} from 'material2-build-tools'; +import {buildConfig, buildScssPipeline, sequenceTask} from 'material2-build-tools'; const {outputDir, packagesDir} = buildConfig; @@ -36,13 +36,16 @@ task('universal:build', sequenceTask( 'clean', ['material:build-release', 'cdk:build-release'], ['universal:copy-release', 'universal:copy-files'], - 'universal:build-app-ts', - 'universal:build-prerender-ts' + ['universal:build-app-ts', 'universal:build-app-scss'], + 'universal:build-prerender-ts', )); /** Task that builds the universal app in the output directory. */ task('universal:build-app-ts', ngcBuildTask(tsconfigAppPath)); +/** Task that builds the universal app styles in the output directory. */ +task('universal:build-app-scss', () => buildScssPipeline(appDir).pipe(dest(outDir))); + /** Task that copies all files to the output directory. */ task('universal:copy-files', copyTask(appDir, outDir));