From 948db825f9814d2d1b4a259ac6e523a00bc32c7d Mon Sep 17 00:00:00 2001 From: Miguel Andrade Date: Wed, 22 Feb 2017 13:02:01 +0000 Subject: [PATCH] bump angular material to v1.0.8 --- README.md | 2 +- app/styles/ember-paper.scss | 1 + index.js | 1 + package.json | 2 +- tests/dummy/app/templates/layout/introduction.hbs | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c245da4b..e221ab9b2 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ If you need a component for your project which has not yet been migrated to vers - The team coordinates who is working on what component(s) with a [shared canvas document](https://usecanvas.com/emberpaper/backlog/5lluHTIZAI8G2797TdEcsD). -- The [Angular Material demo site](https://material.angularjs.org/1.0.7/) provides examples of what we are trying to accomplish. Use version 1.0.7. +- The [Angular Material demo site](https://material.angularjs.org/1.0.8/) provides examples of what we are trying to accomplish. Use version 1.0.8. - Building the `ember-paper` demo application will give you your own up-to-date reference. This can be accomplished by installing ember-paper as if it were an application and running `ember server`. diff --git a/app/styles/ember-paper.scss b/app/styles/ember-paper.scss index 00e8dfa78..aa347dc91 100644 --- a/app/styles/ember-paper.scss +++ b/app/styles/ember-paper.scss @@ -63,6 +63,7 @@ @import 'color-palette'; @import 'default-theme'; @import './angular-material/core/style/mixins'; +@import './angular-material/core/style/themes'; @import './angular-material/core/style/variables'; @import './angular-material/core/style/structure'; @import './angular-material/core/style/typography'; diff --git a/index.js b/index.js index c3171965f..b5950ce90 100644 --- a/index.js +++ b/index.js @@ -85,6 +85,7 @@ module.exports = { var scssFiles = [ //core styles 'core/style/typography.scss', + 'core/style/themes.scss', 'core/style/mixins.scss', 'core/style/variables.scss', 'core/style/structure.scss', diff --git a/package.json b/package.json index c7912405e..9cbe2da84 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "loader.js": "^4.0.10" }, "dependencies": { - "angular-material-source": "angular/material#v1.0.7", + "angular-material-source": "angular/material#v1.0.8", "broccoli-autoprefixer": "^3.0.0", "broccoli-filter": "^1.2.3", "broccoli-funnel": "^1.0.1", diff --git a/tests/dummy/app/templates/layout/introduction.hbs b/tests/dummy/app/templates/layout/introduction.hbs index b35c2e7e9..f06d0419c 100644 --- a/tests/dummy/app/templates/layout/introduction.hbs +++ b/tests/dummy/app/templates/layout/introduction.hbs @@ -12,7 +12,7 @@

Ember Paper's layout system is based on - Angular Material's. + Angular Material's. Most of the class names can be derived from the attributes described in their documentation. Ember Paper uses classes rather than attributes for performance reasons. Under the hood, Angular does the same.