Merge branch 'master' into patch-1

Author: lynnmercier

.travis.yml

@@ -5,7 +5,7 @@ branches:
 matrix:
   include:
     # Unit tests on Node Stable
-    - node_js: node
+    - node_js: 7
       env:
         global:
           - SAUCE_USERNAME=material-sauce

CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="0.12.1"></a>
+## [0.12.1](https://github.com/material-components/material-components-web/compare/v0.12.0...v0.12.1) (2017-05-31)
+
+
+### Bug Fixes
+
+* Include the JavaScript for linear-progress  (#760) (#759) ([94e2221](https://github.com/material-components/material-components-web/commit/94e2221)), closes [#759](https://github.com/material-components/material-components-web/issues/759)
+
+
 <a name="0.12.0"></a>
 # [0.12.0](https://github.com/material-components/material-components-web/compare/v0.11.1...v0.12.0) (2017-05-30)
 
@@ -32,7 +41,7 @@
 
 ### BREAKING CHANGES
 
-* dialog: -  Dialogs do not require a style="visibility:hidden" attribute in html.
+* dialog: -  Dialogs do not require a style="visibility:hidden" attribute in html.
 -  registerTransitionEndHandler, deregisterTransitionEndHandler, and isDialog methods must be implemented by the adapter
 
 
@@ -126,21 +135,21 @@
 ### BREAKING CHANGES
 
 * dialog: There are a few changes that need to be taken into
-account for this commit:
-
-- Dialogs no longer require an `aria-hidden="true"` attribute.
-- Dialogs _do_ require a `style="visibility:hidden"` attribute for
-  correct first render.
-- `trapFocusOnSurface` and `untrapFocusOnSurface` methods must be
-  implemented for the adapter
-- `hasClass`, `setAttr`, `registerFocusTrappingHandler`,
-  `deregisterFocusTrappingHandler`, `numFocusableTargets`,
-  `setDialogFocusFirstTarget`, `setInitialFocus`,
-  `getFocusableElements`, `saveElementTabState`,
-  `restoreElementTabState`, `makeElementUntabbable`, `setBodyAttr`,
-  `rmBodyAttr`, `getFocusedTarget`, and `setFocusedTarget` have all been
-  removed from the adapter.
-- `applyPassive`, `saveElementTabState`, and `restoreElementTabState`
+account for this commit:
+
+- Dialogs no longer require an `aria-hidden="true"` attribute.
+- Dialogs _do_ require a `style="visibility:hidden"` attribute for
+  correct first render.
+- `trapFocusOnSurface` and `untrapFocusOnSurface` methods must be
+  implemented for the adapter
+- `hasClass`, `setAttr`, `registerFocusTrappingHandler`,
+  `deregisterFocusTrappingHandler`, `numFocusableTargets`,
+  `setDialogFocusFirstTarget`, `setInitialFocus`,
+  `getFocusableElements`, `saveElementTabState`,
+  `restoreElementTabState`, `makeElementUntabbable`, `setBodyAttr`,
+  `rmBodyAttr`, `getFocusedTarget`, and `setFocusedTarget` have all been
+  removed from the adapter.
+- `applyPassive`, `saveElementTabState`, and `restoreElementTabState`
   have all been removed from `mdcDialog.util`.
 * grid-list: Adds getNumberOfTiles to grid-list's adapter API. Please update adapters to implement getNumberOfTiles.
 
@@ -212,7 +221,7 @@ to properly align its contents.
 ### BREAKING CHANGES
 
 * select: **New adapter method:** `getValueForOptionAtIndex(index: string) => string`
-should return the "value" of the option at the given index. Please add
+should return the "value" of the option at the given index. Please add
 this method to your adapter implementations.
 * menu: adapters have to implement the new `getAccurateTime`
 method.

demos/switch.html

@@ -67,7 +67,7 @@
       <div class="mdc-toolbar-fixed-adjust"></div>
       <section class="hero">
         <div class="mdc-switch">
-          <input type="checkbox" id="basic-switch" class="mdc-switch__native-control" />
+          <input type="checkbox" class="mdc-switch__native-control" />
           <div class="mdc-switch__background">
             <div class="mdc-switch__knob"></div>
           </div>

packages/material-components-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "material-components-web",
   "description": "Modular and customizable Material Design UI components for the web",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "license": "Apache-2.0",
   "keywords": [
     "material components",
@@ -27,7 +27,7 @@
     "@material/grid-list": "^0.2.3",
     "@material/icon-toggle": "^0.1.12",
     "@material/layout-grid": "^0.1.2",
-    "@material/linear-progress": "^0.1.0",
+    "@material/linear-progress": "^0.1.1",
     "@material/list": "^0.2.9",
     "@material/menu": "^0.2.7",
     "@material/radio": "^0.2.5",

packages/mdc-dialog/mdc-dialog.scss

@@ -135,10 +135,10 @@ $mdc-dialog-dark-theme-bg-color: #303030 !default;
     padding: 8px;
 
     &__button {
-      margin-right: 8px;
+      @include mdc-rtl-reflexive-box(margin, right, 8px);
 
       &:last-child {
-        margin-right: 0;
+        @include mdc-rtl-reflexive-box(margin, right, 0);
       }
     }
   }

packages/mdc-linear-progress/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@material/linear-progress",
   "description": "The Material Components for the web linear progress indicator component",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "Apache-2.0",
   "keywords": [
     "material components",

webpack.config.js

@@ -81,6 +81,7 @@ module.exports = [{
     formField: [path.resolve('./packages/mdc-form-field/index.js')],
     gridList: [path.resolve('./packages/mdc-grid-list/index.js')],
     iconToggle: [path.resolve('./packages/mdc-icon-toggle/index.js')],
+    linearProgress: [path.resolve('./packages/mdc-linear-progress/index.js')],
     menu: [path.resolve('./packages/mdc-menu/index.js')],
     radio: [path.resolve('./packages/mdc-radio/index.js')],
     ripple: [path.resolve('./packages/mdc-ripple/index.js')],