From 4254e7962e0b7205df06a99e1b9458c7daa70351 Mon Sep 17 00:00:00 2001
From: Michael Sitter <sitter.michael@gmail.com>
Date: Sun, 7 May 2017 15:33:52 -0700
Subject: [PATCH 01/14] adding click handler (#726)

---
 src/components/mdRadio/mdRadio.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/mdRadio/mdRadio.vue b/src/components/mdRadio/mdRadio.vue
index f8604f4..b37bee1 100644
--- a/src/components/mdRadio/mdRadio.vue
+++ b/src/components/mdRadio/mdRadio.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="md-radio" :class="[themeClass, classes]">
     <div class="md-radio-container" @click="toggleCheck">
-      <input type="radio" :name="name" :id="id" :disabled="disabled" :value="value">
+      <input type="radio" :name="name" :id="id" :disabled="disabled" :value="value" @click="toggleCheck">
       <md-ink-ripple :md-disabled="disabled" />
     </div>
 

From 3754e5e4a23082c59d4958dd530849dfee2427b1 Mon Sep 17 00:00:00 2001
From: Captain Pangyo <joshua1988@users.noreply.github.com>
Date: Mon, 8 May 2017 07:34:20 +0900
Subject: [PATCH 02/14] Added the code samples for Demo in List Components
 (Multiple options, Multiple Expand) (#725)

---
 docs/src/pages/components/List.vue | 60 ++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/docs/src/pages/components/List.vue b/docs/src/pages/components/List.vue
index d0284a1..2527a1e 100644
--- a/docs/src/pages/components/List.vue
+++ b/docs/src/pages/components/List.vue
@@ -974,6 +974,17 @@
 
           <div slot="code">
             <code-block lang="xml">
+              &lt;div class="phone-viewport"&gt;
+                &lt;md-list&gt;
+                  &lt;md-list-item&gt;Plain Text&lt;/md-list-item&gt;
+                  &lt;md-list-item target="_blank" href="https://google.com"&gt;Link&lt;/md-list-item&gt;
+                  &lt;md-list-item @click.native="openAlert"&gt;Button&lt;/md-list-item&gt;
+                  &lt;md-list-item&gt;
+                    &lt;router-link to="/components/list"&gt;Router View&lt;/router-link&gt;
+                  &lt;/md-list-item&gt;
+                &lt;/md-list&gt;
+              &lt;/div&gt;
+
               &lt;div class=&quot;phone-viewport&quot;&gt;
                 &lt;md-list&gt;
                   &lt;md-list-item&gt;
@@ -1022,6 +1033,55 @@
                   &lt;/md-list-item&gt;
                 &lt;/md-list&gt;
               &lt;/div&gt;
+
+              &lt;div class="phone-viewport"&gt;
+                &lt;md-list&gt;
+                  &lt;md-list-item md-expand-multiple&gt;
+                    &lt;md-icon&gt;whatshot&lt;/md-icon&gt;
+                    &lt;span&gt;News&lt;/span&gt;
+
+                    &lt;md-list-expand&gt;
+                      &lt;md-list&gt;
+                        &lt;md-list-item class="md-inset"&gt;World&lt;/md-list-item&gt;
+                        &lt;md-list-item class="md-inset"&gt;Americas&lt;/md-list-item&gt;
+                        &lt;md-list-item class="md-inset"&gt;Europe&lt;/md-list-item&gt;
+                      &lt;/md-list&gt;
+                    &lt;/md-list-expand&gt;
+                  &lt;/md-list-item&gt;
+
+                  &lt;md-list-item md-expand-multiple&gt;
+                    &lt;md-icon&gt;videogame_asset&lt;/md-icon&gt;
+                    &lt;span&gt;Games&lt;/span&gt;
+
+                    &lt;md-list-expand&gt;
+                      &lt;md-list&gt;
+                        &lt;md-list-item class="md-inset"&gt;Console&lt;/md-list-item&gt;
+                        &lt;md-list-item class="md-inset"&gt;PC&lt;/md-list-item&gt;
+                        &lt;md-list-item class="md-inset"&gt;Phone&lt;/md-list-item&gt;
+                      &lt;/md-list&gt;
+                    &lt;/md-list-expand&gt;
+                  &lt;/md-list-item&gt;
+
+                  &lt;md-list-item md-expand-multiple&gt;
+                    &lt;md-icon&gt;video_library&lt;/md-icon&gt;
+                    &lt;span&gt;Video&lt;/span&gt;
+
+                    &lt;md-list-expand&gt;
+                      &lt;md-list&gt;
+                        &lt;md-list-item class="md-inset"&gt;Humor&lt;/md-list-item&gt;
+                        &lt;md-list-item class="md-inset"&gt;Music&lt;/md-list-item&gt;
+                        &lt;md-list-item class="md-inset"&gt;Movies&lt;/md-list-item&gt;
+                        &lt;md-list-item class="md-inset"&gt;TV Shows&lt;/md-list-item&gt;
+                      &lt;/md-list&gt;
+                    &lt;/md-list-expand&gt;
+                  &lt;/md-list-item&gt;
+
+                  &lt;md-list-item&gt;
+                    &lt;md-icon&gt;shopping_basket&lt;/md-icon&gt;
+                    &lt;span&gt;Shop&lt;/span&gt;
+                  &lt;/md-list-item&gt;
+                &lt;/md-list&gt;
+              &lt;/div&gt;
             </code-block>
           </div>
         </example-box>

From bb11f5c64ede1c6fa7c92fc99928ed6876b2c55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20de=20Saint-Exup=C3=A9ry?= <stexthomas@gmail.com>
Date: Mon, 8 May 2017 00:36:25 +0200
Subject: [PATCH 03/14] Fix floating action button incoherent move #713 (#714)

---
 src/components/mdSnackbar/mdSnackbar.scss | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/components/mdSnackbar/mdSnackbar.scss b/src/components/mdSnackbar/mdSnackbar.scss
index e9fefbf..56165e3 100644
--- a/src/components/mdSnackbar/mdSnackbar.scss
+++ b/src/components/mdSnackbar/mdSnackbar.scss
@@ -177,21 +177,3 @@ $snackbar-space: $snackbar-height / 2;
     }
   }
 }
-
-.md-has-toast {
-  .md-fab.md-fab-top-right,
-  .md-fab.md-fab-top-center,
-  .md-fab.md-fab-top-left {
-    @include layout-xsmall {
-      transform: translate3D(0, $snackbar-height - 4px, 0);
-    }
-  }
-
-  .md-fab.md-fab-bottom-right,
-  .md-fab.md-fab-bottom-center,
-  .md-fab.md-fab-bottom-left {
-    @include layout-xsmall {
-      transform: translate3D(0, -$snackbar-height + 4px, 0);
-    }
-  }
-}

From 208a423226e4425d24210b0684d61c94409b80e3 Mon Sep 17 00:00:00 2001
From: Samuell <Samuell1@users.noreply.github.com>
Date: Mon, 8 May 2017 00:37:03 +0200
Subject: [PATCH 04/14] Allow object for option in select (#708)

---
 src/components/mdSelect/mdOption.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/mdSelect/mdOption.vue b/src/components/mdSelect/mdOption.vue
index 08e45ce..12c6ac7 100644
--- a/src/components/mdSelect/mdOption.vue
+++ b/src/components/mdSelect/mdOption.vue
@@ -22,7 +22,7 @@
   export default {
     name: 'md-option',
     props: {
-      value: [String, Boolean, Number]
+      value: [String, Boolean, Number, Object]
     },
     data: () => ({
       parentSelect: {},

From cf938ab63529e31e20304204a1fbd1d8f89bcc0e Mon Sep 17 00:00:00 2001
From: takikoo <rt222cr@student.lnu.se>
Date: Mon, 8 May 2017 00:38:03 +0200
Subject: [PATCH 05/14] DOCS: Added missing argument in code example (#702)

Tried one of the code examples and noticed that Vue gave the following warning:

[Vue warn]: Missing required prop: "value"
(found in <MdDialogPrompt>)

Added missing argument in code example.
---
 docs/src/pages/components/Dialog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/src/pages/components/Dialog.vue b/docs/src/pages/components/Dialog.vue
index b418c40..c095686 100644
--- a/docs/src/pages/components/Dialog.vue
+++ b/docs/src/pages/components/Dialog.vue
@@ -534,6 +534,7 @@
                 :md-cancel-text=&quot;prompt.cancel&quot;
                 @open=&quot;onOpen&quot;
                 @close=&quot;onClose&quot;
+                v-model=&quot;prompt.value&quot;
                 ref=&quot;dialog6&quot;&gt;
               &lt;/md-dialog-prompt&gt;
 

From 8042caef99319f1e21518c89b2e38d8422061d80 Mon Sep 17 00:00:00 2001
From: Samuell <Samuell1@users.noreply.github.com>
Date: Mon, 8 May 2017 00:39:21 +0200
Subject: [PATCH 06/14] Fix radio button null value (#693)

* Fix if value for radio button is null

* Update mdRadio.vue
---
 src/components/mdRadio/mdRadio.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/mdRadio/mdRadio.vue b/src/components/mdRadio/mdRadio.vue
index b37bee1..abb9b68 100644
--- a/src/components/mdRadio/mdRadio.vue
+++ b/src/components/mdRadio/mdRadio.vue
@@ -32,7 +32,7 @@
     computed: {
       classes() {
         return {
-          'md-checked': typeof this.value !== 'undefined' && this.mdValue.toString() === this.value.toString(),
+          'md-checked': typeof this.value !== 'undefined' && this.value !== null && this.mdValue.toString() === this.value.toString(),
           'md-disabled': this.disabled
         };
       }

From ed4c9c5cba21028212650bacc352313ef3cc901f Mon Sep 17 00:00:00 2001
From: Paul Schmidt <rookian@gmail.com>
Date: Mon, 8 May 2017 00:39:38 +0200
Subject: [PATCH 07/14] Dont overwrite currentSize of mdTablePagination (#692)

* Dont overwrite currentSize of mdTablePagination with
the first value from mdPageOptions.

Check the value currentSize if it is in the array of options and set it, otherwise just take the (default) first option.

* map props default value to local data property

* allow passing the prop as a string value

by parsing it as an int
---
 src/components/mdTable/mdTablePagination.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/mdTable/mdTablePagination.vue b/src/components/mdTable/mdTablePagination.vue
index 6fcd7a8..6c7792b 100644
--- a/src/components/mdTable/mdTablePagination.vue
+++ b/src/components/mdTable/mdTablePagination.vue
@@ -49,7 +49,7 @@
         subTotal: 0,
         totalItems: 0,
         currentPage: 1,
-        currentSize: 0
+        currentSize: parseInt(this.mdSize, 10)
       };
     },
     watch: {
@@ -108,7 +108,7 @@
       this.$nextTick(() => {
         this.subTotal = this.currentPage * this.currentSize;
         this.mdPageOptions = this.mdPageOptions || [10, 25, 50, 100];
-        this.currentSize = this.mdPageOptions[0];
+        this.currentSize = this.mdPageOptions.includes(this.currentSize) ? this.currentSize : this.mdPageOptions[0];
         this.canFireEvents = true;
       });
     }

From ebf55c18ab8862381e5661aa7fbe2cb99c571f72 Mon Sep 17 00:00:00 2001
From: Andrew LeTourneau <centerorbit@gmail.com>
Date: Sun, 7 May 2017 17:40:08 -0500
Subject: [PATCH 08/14] Fixes #629 Unable to set disabled property of
 md-bottom-bar-item (#689)

---
 src/components/mdBottomBar/mdBottomBarItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/mdBottomBar/mdBottomBarItem.vue b/src/components/mdBottomBar/mdBottomBarItem.vue
index 6bf6b76..c9ca8b7 100644
--- a/src/components/mdBottomBar/mdBottomBarItem.vue
+++ b/src/components/mdBottomBar/mdBottomBarItem.vue
@@ -28,7 +28,7 @@
       mdIconSrc: String,
       mdIconset: String,
       mdActive: Boolean,
-      disabled: String,
+      disabled: Boolean,
       href: String
     },
     data() {

From 68142d732a13584b81fe0ba0cfbb8b0f8360df42 Mon Sep 17 00:00:00 2001
From: Rafael Wizzzet Kamashev <wizzzet@gmail.com>
Date: Mon, 8 May 2017 01:42:04 +0300
Subject: [PATCH 09/14] some required scss imports added (#670)

* some required scss imports added

* mdRadio scss imports added
---
 src/components/mdRadio/mdRadio.scss | 1 +
 src/core/stylesheets/base.scss      | 3 +++
 src/core/stylesheets/scrollbar.scss | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/components/mdRadio/mdRadio.scss b/src/components/mdRadio/mdRadio.scss
index 2fa6977..f1ca898 100644
--- a/src/components/mdRadio/mdRadio.scss
+++ b/src/components/mdRadio/mdRadio.scss
@@ -1,4 +1,5 @@
 @import '../../core/stylesheets/variables.scss';
+@import '../mdCheckbox/mdCheckbox.scss';
 
 $radio-size: 20px;
 $radio-ripple-size: 48px;
diff --git a/src/core/stylesheets/base.scss b/src/core/stylesheets/base.scss
index 3ef8d44..f9df9b9 100644
--- a/src/core/stylesheets/base.scss
+++ b/src/core/stylesheets/base.scss
@@ -1,3 +1,6 @@
+@import 'variables.scss';
+@import 'typography.scss';
+
 /*  Structure
    ========================================================================== */
 
diff --git a/src/core/stylesheets/scrollbar.scss b/src/core/stylesheets/scrollbar.scss
index 6d8b914..acbcd55 100644
--- a/src/core/stylesheets/scrollbar.scss
+++ b/src/core/stylesheets/scrollbar.scss
@@ -1,3 +1,5 @@
+@import 'variables.scss';
+
 .md-scrollbar {
   &::-webkit-scrollbar,
   ::-webkit-scrollbar {

From a6678ab6206b65a16143edbd36b16479f4c18526 Mon Sep 17 00:00:00 2001
From: Matthew Pietz <sirlancelot@users.noreply.github.com>
Date: Sun, 7 May 2017 15:46:49 -0700
Subject: [PATCH 10/14] Refactor Theme Engine (#646)

- Optimize parseStyle method to run a single RegExp replace
- Abstract DOM manipulation to check for VUE_ENV first
- Add theme name to <md-theme> element when it would render its own tag
- Recompute styles when a new set of selectors is added (via styles.push)
- Use computed property to find closest themed ancestor for mixin
- Only grab md-name attribute from an md-theme component (<md-table-edit>
  uses the md-name attribute for <input> tags)
---
 src/core/components/mdTheme/dom.js      |  38 ++++
 src/core/components/mdTheme/index.js    | 240 ++++++++++++------------
 src/core/components/mdTheme/mdTheme.vue |  21 ++-
 src/core/components/mdTheme/mixin.js    |  66 +++----
 4 files changed, 199 insertions(+), 166 deletions(-)
 create mode 100644 src/core/components/mdTheme/dom.js

diff --git a/src/core/components/mdTheme/dom.js b/src/core/components/mdTheme/dom.js
new file mode 100644
index 0000000..ab02670
--- /dev/null
+++ b/src/core/components/mdTheme/dom.js
@@ -0,0 +1,38 @@
+export var changeHtmlMetaColor;
+export var createNewStyleElement;
+
+if (process.env.VUE_ENV !== 'server') {
+  changeHtmlMetaColor = (color, themeClass, previousClass) => {
+    var elem = document.querySelector('meta[name="theme-color"]');
+
+    if (elem) {
+      elem.setAttribute('content', color);
+    } else {
+      elem = document.createElement('meta');
+      elem.setAttribute('name', 'theme-color');
+      elem.setAttribute('content', color);
+
+      document.head.appendChild(elem);
+    }
+
+    document.body.classList.remove(previousClass);
+    document.body.classList.add(themeClass);
+  };
+
+  createNewStyleElement = (style, styleId) => {
+    const head = document.head;
+    const styleElement = head.querySelector('#' + styleId);
+
+    if (!styleElement) {
+      const newTag = document.createElement('style');
+
+      newTag.type = 'text/css';
+      newTag.id = styleId;
+      newTag.textContent = style;
+
+      head.appendChild(newTag);
+    } else {
+      styleElement.textContent = style;
+    }
+  };
+}
diff --git a/src/core/components/mdTheme/index.js b/src/core/components/mdTheme/index.js
index 2da6bf1..c9ee292 100644
--- a/src/core/components/mdTheme/index.js
+++ b/src/core/components/mdTheme/index.js
@@ -1,8 +1,10 @@
 import palette from './palette';
 import rgba from './rgba';
 import mdTheme from './mdTheme';
+import { changeHtmlMetaColor, createNewStyleElement } from './dom';
 
 const VALID_THEME_TYPE = ['primary', 'accent', 'background', 'warn', 'hue-1', 'hue-2', 'hue-3'];
+const TYPE_REGEX = new RegExp('(' + VALID_THEME_TYPE.join('|').toUpperCase() + ')-(COLOR|CONTRAST)-?(A?\\d*)-?(\\d*\\.?\\d+)?', 'g');
 const DEFAULT_THEME_COLORS = {
   primary: 'indigo',
   accent: 'pink',
@@ -22,170 +24,158 @@ const DEFAULT_THEME_COLORS = {
   }
 };*/
 
-const createNewStyleElement = (style, name) => {
-  let head = document.head;
-  let styleId = 'md-theme-' + name;
-  let styleElement = head.querySelector('#' + styleId);
-
-  if (!styleElement) {
-    let newTag = document.createElement('style');
-
-    style = style.replace(/THEME_NAME/g, styleId);
-
-    newTag.type = 'text/css';
-    newTag.id = styleId;
-    newTag.textContent = style;
-
-    head.appendChild(newTag);
-  } else {
-    styleElement.textContent = style;
-  }
-};
-
-let registeredThemes = [];
-let registeredPrimaryColor = {};
+const registeredPrimaryColor = {};
+const injectedStyles = {};
 
 const parseStyle = (style, theme, name) => {
-  VALID_THEME_TYPE.forEach((type) => {
-    style = style.replace(RegExp('(' + type.toUpperCase() + ')-(COLOR|CONTRAST)-?(A?\\d*)-?(\\d*\\.?\\d+)?', 'g'), (match, paletteType, colorType, hue, opacity) => {
-      let color;
-      let colorVariant = +hue === 0 ? 500 : hue;
+  return style.replace(TYPE_REGEX, (match, type, colorType, hue, opacity) => {
+    let color;
+    let colorVariant = +hue === 0 ? 500 : hue;
 
-      if (theme[type]) {
-        if (typeof theme[type] === 'string') {
-          color = palette[theme[type]];
-        } else {
-          color = palette[theme[type].color] || palette[DEFAULT_THEME_COLORS[type]];
-          colorVariant = +hue === 0 ? theme[type].hue : hue;
-        }
+    type = type.toLowerCase();
+
+    if (theme[type]) {
+      if (typeof theme[type] === 'string') {
+        color = palette[theme[type]];
       } else {
-        color = palette[DEFAULT_THEME_COLORS[type]];
+        color = palette[theme[type].color] || palette[DEFAULT_THEME_COLORS[type]];
+        colorVariant = +hue === 0 ? theme[type].hue : hue;
       }
+    } else {
+      color = palette[DEFAULT_THEME_COLORS[type]];
+    }
 
-      if (colorType === 'COLOR') {
-        let isDefault = palette[theme[type]];
+    if (colorType === 'COLOR') {
+      let isDefault = palette[theme[type]];
 
-        if (!colorVariant && !isDefault) {
-          if (type === 'accent') {
-            colorVariant = 'A200';
-          } else if (type === 'background') {
-            colorVariant = 50;
-          }
+      if (!colorVariant && !isDefault) {
+        if (type === 'accent') {
+          colorVariant = 'A200';
+        } else if (type === 'background') {
+          colorVariant = 50;
         }
+      }
 
-        if (type === 'primary') {
-          registeredPrimaryColor[name] = color[colorVariant];
-        }
-
-        if (opacity) {
-          return rgba(color[colorVariant], opacity);
-        }
-
-        return color[colorVariant];
-      }
-
-      let isDarkText = color.darkText.indexOf(colorVariant) >= 0;
-
-      if (theme[type] && typeof theme[type] !== 'string' && theme[type].textColor) {
-        if (theme[type].textColor === 'black') {
-          isDarkText = true;
-        } else if (theme[type].textColor === 'white') {
-          isDarkText = false;
-        }
-      }
-
-      if (isDarkText) {
-        if (opacity) {
-          return rgba('#000', opacity);
-        }
-
-        return 'rgba(0, 0, 0, .87)';
+      if (type === 'primary') {
+        registeredPrimaryColor[name] = color[colorVariant];
       }
 
       if (opacity) {
-        return rgba('#fff', opacity);
+        return rgba(color[colorVariant], opacity);
       }
 
-      return 'rgba(255, 255, 255, .87)';
-    });
-  });
+      return color[colorVariant];
+    }
 
-  return style;
-};
+    let isDarkText = color.darkText.indexOf(colorVariant) >= 0;
 
-const registerTheme = (theme, name, themeStyles) => {
-  let parsedStyle = [];
+    if (theme[type] && typeof theme[type] !== 'string' && theme[type].textColor) {
+      if (theme[type].textColor === 'black') {
+        isDarkText = true;
+      } else if (theme[type].textColor === 'white') {
+        isDarkText = false;
+      }
+    }
 
-  themeStyles.forEach((style) => {
-    parsedStyle.push(parseStyle(style, theme, name));
-  });
+    if (isDarkText) {
+      if (opacity) {
+        return rgba('#000', opacity);
+      }
 
-  createNewStyleElement(parsedStyle.join('\n'), name);
-};
+      return 'rgba(0, 0, 0, .87)';
+    }
 
-const registerAllThemes = (themes, themeStyles) => {
-  let themeNames = themes ? Object.keys(themes) : [];
+    if (opacity) {
+      return rgba('#fff', opacity);
+    }
 
-  themeNames.forEach((name) => {
-    registerTheme(themes[name], name, themeStyles);
-    registeredThemes.push(name);
+    return 'rgba(255, 255, 255, .87)';
   });
 };
 
-const changeHtmlMetaColor = (color) => {
-  let themeColorElement = document.querySelector('meta[name="theme-color"]');
+function warnNotFound(themeName) {
+  console.warn(`The theme '${themeName}' doesn't exists. You need to register` +
+    ' it first in order to use.');
+}
 
-  if (themeColorElement) {
-    themeColorElement.setAttribute('content', color);
-  } else {
-    themeColorElement = document.createElement('meta');
-    themeColorElement.setAttribute('name', 'theme-color');
-    themeColorElement.setAttribute('content', color);
-
-    document.head.appendChild(themeColorElement);
-  }
-};
+function injectStyle(style, spec, name, styleId) {
+  if (createNewStyleElement) {
+    style = parseStyle(style, spec, name);
+    style = style.replace(/THEME_NAME/g, styleId);
+
+    createNewStyleElement(style, styleId);
+  }
+}
 
 export default function install(Vue) {
   Vue.material = new Vue({
-    data: () => ({
+    data: {
+      currentTheme: 'default',
+      inkRipple: true,
+      prefix: 'md-theme-',
       styles: [],
-      currentTheme: null,
-      inkRipple: true
-    }),
+      themes: {
+        default: DEFAULT_THEME_COLORS
+      }
+    },
+    watch: {
+      styles() {
+        this.refreshInjectedStyles();
+      }
+    },
     methods: {
       registerPalette(name, spec) {
         palette[name] = spec;
       },
+      useTheme(name) {
+        if (name in injectedStyles) {
+          return;
+        }
+        const spec = this.themes[name];
+
+        if (!spec) {
+          return warnNotFound(name);
+        }
+
+        injectStyle(this.styles.join('\n'), spec, name, this.prefix + name);
+
+        return injectedStyles[name] = true;
+      },
+      refreshInjectedStyles() {
+        const styles = this.styles.join('\n');
+        const prefix = this.prefix;
+
+        Object.keys(injectedStyles).forEach((name) => {
+          const spec = this.themes[name];
+
+          injectStyle(styles, spec, name, prefix + name);
+        });
+      },
       registerTheme(name, spec) {
-        let theme = {};
-
         if (typeof name === 'string') {
-          theme[name] = spec;
+          this.themes[name] = spec;
         } else {
-          theme = name;
+          Object.keys(name).forEach((k) => this.themes[k] = name[k]);
+        }
+      },
+      setCurrentTheme(name) {
+        if (name === this.currentTheme) {
+          return;
         }
 
-        registerAllThemes(theme, this.styles);
-      },
-      applyCurrentTheme(themeName) {
-        changeHtmlMetaColor(registeredPrimaryColor[themeName]);
-        document.body.classList.remove('md-theme-' + this.currentTheme);
-        document.body.classList.add('md-theme-' + themeName);
-        this.currentTheme = themeName;
-      },
-      setCurrentTheme(themeName) {
-        if (registeredThemes.indexOf(themeName) >= 0) {
-          this.applyCurrentTheme(themeName);
-        } else {
-          if (registeredThemes.indexOf('default') === -1) {
-            this.registerTheme('default', DEFAULT_THEME_COLORS);
-          } else {
-            console.warn(`The theme '${themeName}' doesn't exists. You need to register it first in order to use.`);
-          }
+        const prefix = this.prefix;
 
-          this.applyCurrentTheme('default');
+        this.useTheme(name);
+
+        if (changeHtmlMetaColor) {
+          changeHtmlMetaColor(
+            registeredPrimaryColor[name],
+            prefix + this.currentTheme,
+            prefix + name
+          );
         }
+
+        this.currentTheme = name;
       }
     }
   });
diff --git a/src/core/components/mdTheme/mdTheme.vue b/src/core/components/mdTheme/mdTheme.vue
index e2438fc..793d04c 100644
--- a/src/core/components/mdTheme/mdTheme.vue
+++ b/src/core/components/mdTheme/mdTheme.vue
@@ -8,17 +8,26 @@
         default: 'default'
       }
     },
-    data: () => ({
-      name: 'md-theme'
-    }),
-    render(render) {
+    render(createElement) {
       if (this.mdTag || this.$slots.default.length > 1) {
-        return render(this.mdTag || 'div', {
-          staticClass: 'md-theme'
+        return createElement(this.mdTag || 'div', {
+          staticClass: this.$material.prefix + this.mdName
         }, this.$slots.default);
       }
 
       return this.$slots.default[0];
+    },
+    watch: {
+      mdName(value) {
+        this.$material.useTheme(value);
+      }
+    },
+    beforeMount() {
+      const localTheme = this.mdName;
+
+      if (localTheme) {
+        this.$material.useTheme(localTheme);
+      }
     }
   };
 </script>
diff --git a/src/core/components/mdTheme/mixin.js b/src/core/components/mdTheme/mixin.js
index 77db9d2..dc745f0 100644
--- a/src/core/components/mdTheme/mixin.js
+++ b/src/core/components/mdTheme/mixin.js
@@ -1,47 +1,43 @@
+// Theme mixin
+
+// Grab the closest ancestor component's `md-theme` attribute OR grab the
+// `md-name` attribute from an `<md-theme>` component.
+function getAncestorThemeName(component) {
+  if (!component) {
+    return null;
+  }
+
+  let name = component.mdTheme;
+
+  if (!name && component.$options._componentTag === 'md-theme') {
+    name = component.mdName;
+  }
+
+  return name || getAncestorThemeName(component.$parent);
+}
+
 export default {
   props: {
     mdTheme: String
   },
-  data: () => ({
-    closestThemedParent: false
-  }),
-  methods: {
-    getClosestThemedParent($parent) {
-      if (!$parent || !$parent.$el || $parent._uid === 0) {
-        return false;
-      }
-
-      if ($parent.mdTheme || $parent.mdName) {
-        return $parent;
-      }
-
-      return this.getClosestThemedParent($parent.$parent);
-    }
-  },
   computed: {
+    mdEffectiveTheme() {
+      return getAncestorThemeName(this) || this.$material.currentTheme;
+    },
     themeClass() {
-      if (this.mdTheme) {
-        return 'md-theme-' + this.mdTheme;
-      }
-
-      let theme = this.closestThemedParent.mdTheme;
-
-      if (!theme) {
-        if (this.closestThemedParent) {
-          theme = this.closestThemedParent.mdName;
-        } else {
-          theme = this.$material.currentTheme;
-        }
-      }
-
-      return 'md-theme-' + theme;
+      return this.$material.prefix + this.mdEffectiveTheme;
     }
   },
-  mounted() {
-    this.closestThemedParent = this.getClosestThemedParent(this.$parent);
+  watch: {
+    mdTheme(value) {
+      this.$material.useTheme(value);
+    }
+  },
+  beforeMount() {
+    const localTheme = this.mdTheme;
 
-    if (!this.$material.currentTheme) {
-      this.$material.setCurrentTheme('default');
+    if (localTheme) {
+      this.$material.useTheme(localTheme);
     }
   }
 };

From f8868e6492e3e91af389363f99b9fc457a48f703 Mon Sep 17 00:00:00 2001
From: d3radicated <john.ryan.camatog@gmail.com>
Date: Mon, 8 May 2017 06:47:09 +0800
Subject: [PATCH 11/14] Fix undefined variable in md-radio SCSS (#635)

---
 src/components/mdRadio/mdRadio.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/mdRadio/mdRadio.scss b/src/components/mdRadio/mdRadio.scss
index f1ca898..ad1067e 100644
--- a/src/components/mdRadio/mdRadio.scss
+++ b/src/components/mdRadio/mdRadio.scss
@@ -2,7 +2,7 @@
 @import '../mdCheckbox/mdCheckbox.scss';
 
 $radio-size: 20px;
-$radio-ripple-size: 48px;
+$radio-touch-size: 48px;
 
 .md-radio {
   width: auto;
@@ -20,8 +20,8 @@ $radio-ripple-size: 48px;
     transition: $swift-ease-out;
 
     &:before {
-      width: $checkbox-touch-size;
-      height: $checkbox-touch-size;
+      width: $radio-touch-size;
+      height: $radio-touch-size;
       position: absolute;
       top: 50%;
       left: 50%;
@@ -58,8 +58,8 @@ $radio-ripple-size: 48px;
       color: rgba(#000, .54);
 
       .md-ripple {
-        width: $radio-ripple-size !important;
-        height: $radio-ripple-size !important;
+        width: $radio-touch-size !important;
+        height: $radio-touch-size !important;
         top: 0 !important;
         right: 0 !important;
         bottom: 0 !important;

From e084bdc9ee5565978eb6fd0a3f6f2191340916d9 Mon Sep 17 00:00:00 2001
From: d3radicated <john.ryan.camatog@gmail.com>
Date: Mon, 8 May 2017 06:49:43 +0800
Subject: [PATCH 12/14] Fix subtotal not updating (#625)

---
 src/components/mdTable/mdTablePagination.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/mdTable/mdTablePagination.vue b/src/components/mdTable/mdTablePagination.vue
index 6c7792b..357eb08 100644
--- a/src/components/mdTable/mdTablePagination.vue
+++ b/src/components/mdTable/mdTablePagination.vue
@@ -54,6 +54,9 @@
     },
     watch: {
       mdTotal(val) {
+        const sub = this.currentPage * this.currentSize;
+
+        this.subTotal = sub > val ? val : sub;
         this.totalItems = isNaN(val) ? Number.MAX_SAFE_INTEGER : parseInt(val, 10);
       },
       mdSize(val) {

From fba6cf5039775eaeccd0e01875ba5ca71cd6af17 Mon Sep 17 00:00:00 2001
From: Kevin Pilard <kevin@pilard.de>
Date: Mon, 8 May 2017 00:50:00 +0200
Subject: [PATCH 13/14] md-slect: key navigation ignores mdSubheader onEnter
 (#592) (#623)

---
 src/components/mdMenu/mdMenuContent.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/mdMenu/mdMenuContent.vue b/src/components/mdMenu/mdMenuContent.vue
index a26568c..4076c22 100644
--- a/src/components/mdMenu/mdMenuContent.vue
+++ b/src/components/mdMenu/mdMenuContent.vue
@@ -50,8 +50,13 @@
       },
       fireClick() {
         if (this.highlighted > 0) {
-          this.$children[0].$children[this.highlighted - 1].$el.click();
+          this.getOptions()[this.highlighted - 1].$el.click();
         }
+      },
+      getOptions() {
+        return this.$children[0].$children.filter((child) => {
+          return child.$el.classList.contains('md-option');
+        });
       }
     },
     mounted() {

From 571635c21dd10c342b007ec8cac6330fa47b9fff Mon Sep 17 00:00:00 2001
From: Kevin Pilard <kevin@pilard.de>
Date: Mon, 8 May 2017 00:50:18 +0200
Subject: [PATCH 14/14] mdSwitch can be used without v-model (#607) (#622)

---
 src/components/mdSwitch/mdSwitch.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/mdSwitch/mdSwitch.vue b/src/components/mdSwitch/mdSwitch.vue
index b5b2a0b..cec9bd2 100644
--- a/src/components/mdSwitch/mdSwitch.vue
+++ b/src/components/mdSwitch/mdSwitch.vue
@@ -38,13 +38,13 @@
     data() {
       return {
         leftPos: initialPosition,
-        checked: this.value
+        checked: Boolean(this.value)
       };
     },
     computed: {
       classes() {
         return {
-          'md-checked': Boolean(this.value),
+          'md-checked': this.checked,
           'md-disabled': this.disabled
         };
       },