Merge branch 'release/1.1.0'

NeilujD · Oct 17, 2016 · fd57712 · fd57712
2 parents c4a0a23 + 0dc24c4
commit fd57712
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 70 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "paper-buttons-group",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "A button group with paper-button style",
   "homepage": "https://neilujd.github.io/paper-buttons-group",
   "authors": [
@@ -32,7 +32,7 @@
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
     "web-component-tester": "^4.0.0",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.20",
     "iron-icon": "PolymerElements/iron-icon#^1.0.11",
     "iron-icons": "PolymerElements/iron-icons#^1.1.3"
   }

diff --git a/paper-buttons-group.html b/paper-buttons-group.html
@@ -39,75 +39,76 @@
 -->
 
 <dom-module id="paper-buttons-group">
-  <style include="paper-material-shared-styles">
-    :host {
-      @apply(--layout-horizontal);
-      overflow: hidden;
-      @apply(--layout-inline);
-      position: relative;
-      box-sizing: border-box;
-      min-width: 5.14em;
-      margin: 0 0.29em;
-      background: transparent;
-      -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-      -webkit-tap-highlight-color: transparent;
-      font: inherit;
-      text-transform: uppercase;
-      outline-width: 0;
-      border-radius: 3px;
-      -moz-user-select: none;
-      -ms-user-select: none;
-      -webkit-user-select: none;
-      user-select: none;
-      cursor: pointer;
-      z-index: 0;$
-
-      @apply(--paper-font-common-base);
-      @apply(--paper-buttons-group);
-    }
-
-    :host([hidden]) {
-      display: none !important;
-    }
-
-    :host([raised].keyboard-focus) {
-      font-weight: bold;
-      @apply(--paper-buttons-group-raised-keyboard-focus);
-    }
-
-    :host(:not([raised]).keyboard-focus) {
-      font-weight: bold;
-      @apply(--paper-buttons-group-flat-keyboard-focus);
-    }
-
-    :host([disabled]) {
-      background: #eaeaea;
-      color: #a8a8a8;
-      cursor: auto;
-      pointer-events: none;
-
-      @apply(--paper-buttons-group-disabled);
-    }
-
-    :host([animated]) {
-      @apply(--shadow-transition);
-    }
-
-    paper-ripple {
-      color: var(--paper-buttons-group-ink-color);
-    }
-
-    ::content paper-button {
-      border-radius: 0;
-      margin: 0;
-    }
-    ::content paper-button.iron-selected {
-      background-color: var(--google-grey-300);
-      @apply(--paper-buttons-group-selected);
-    }
-  </style>
   <template>
-    <content></content>
+    <style include="paper-material-shared-styles">
+      :host {
+        @apply(--layout-horizontal);
+        overflow: hidden;
+        @apply(--layout-inline);
+        position: relative;
+        box-sizing: border-box;
+        min-width: 5.14em;
+        margin: 0 0.29em;
+        background: transparent;
+        -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+        -webkit-tap-highlight-color: transparent;
+        font: inherit;
+        text-transform: uppercase;
+        outline-width: 0;
+        border-radius: 3px;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        -webkit-user-select: none;
+        user-select: none;
+        cursor: pointer;
+        z-index: 0;
+
+        @apply(--paper-font-common-base);
+        @apply(--paper-buttons-group);
+      }
+
+      :host([hidden]) {
+        display: none !important;
+      }
+
+      :host([raised].keyboard-focus) {
+        font-weight: bold;
+        @apply(--paper-buttons-group-raised-keyboard-focus);
+      }
+
+      :host(:not([raised]).keyboard-focus) {
+        font-weight: bold;
+        @apply(--paper-buttons-group-flat-keyboard-focus);
+      }
+
+      :host([disabled]) {
+        background: #eaeaea;
+        color: #a8a8a8;
+        cursor: auto;
+        pointer-events: none;
+
+        @apply(--paper-buttons-group-disabled);
+      }
+
+      :host([animated]) {
+        @apply(--shadow-transition);
+      }
+
+      paper-ripple {
+        color: var(--paper-buttons-group-ink-color);
+      }
+
+      ::slotted(paper-button) {
+        border-radius: 0;
+        margin: 0;
+      }
+      ::slotted(paper-button.iron-selected) {
+        background-color: var(--google-grey-300);
+        @apply(--paper-buttons-group-selected);
+      }
+    </style>
+
+    <slot></slot>
   </template>
   <script>
     Polymer({