Merge remote-tracking branch 'origin/master' into dev

* origin/master:
  Revert "fix: remove global scoped css affecting all md-content elements"
  chore: remove codesponsor because github is a bad guy!
  fix: remove global scoped css affecting all md-content elements
  chore: remove async attribute
  Revert "build: generate beta 5"
  docs: improve drastically the initial load of documentation

Author: marcos-hotmart

build/docs/webpack.js

@@ -133,6 +133,22 @@ const webpackConfig = {
       allChunks: true,
       filename: '[name].[contenthash:8].css'
     }),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks (module) {
+        let resource = module.resource
+
+        if (resource && (/\.js$/).test(resource)) {
+          return resource.indexOf(config.nodePath) >= 0
+        }
+
+        return false
+      }
+    }),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'manifest',
+      chunks: ['vendor']
+    }),
     new webpack.BannerPlugin({
       banner,
       raw: true,
@@ -177,22 +193,6 @@ const webpackConfig = {
       }
     }),
     new PreloadWebpackPlugin(),
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'vendor',
-      minChunks (module) {
-        let resource = module.resource
-
-        if (resource && (/\.js$/).test(resource)) {
-          return resource.indexOf(config.nodePath) >= 0
-        }
-
-        return false
-      }
-    }),
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'manifest',
-      chunks: ['vendor']
-    }),
     new OptimizeCssAssetsPlugin({
       canPrint: false
     }),

docs/ads.html

@@ -1,11 +1,5 @@
 <!-- Carbon Ads -->
 <script async src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=vuematerialio" id="_carbonads_js"></script>
 
-<!-- Code Sponsor -->
-<div class="code-sponsor-widget">
-  <div id="code-sponsor-widget" class="code-sponsor-widget-frame"></div>
-</div>
-<script src="https://app.codesponsor.io/scripts/Tuxp4vQN_tThtWBhF8yOtA?theme=light&amp;width=330"></script>
-
 <!-- Amazon Pixel -->
 <img src="//ir-na.amazon-adsystem.com/e/ir?t=vuematerial-20&l=ur2&o=1" class="amazon-pixel" />

docs/app/components/AdManager.vue

@@ -1,20 +1,18 @@
+<template>
+  <div class="carbon-ads-widget"></div>
+</template>
+
 <script>
   export default {
     name: 'AdManager',
-    abstract: true,
     data: () => ({
-      carbonEl: null,
-      codeSponsorEl: null
+      carbonEl: null
     }),
-    render () {
-      return null
-    },
     methods: {
       saveAdsElements () {
         this.carbonEl = document.getElementById('carbonads')
-        this.codeSponsorEl = document.querySelector('.code-sponsor-widget')
 
-        if (!this.carbonEl || !this.codeSponsorEl) {
+        if (!this.carbonEl) {
           this.$destroy()
         }
       },
@@ -24,11 +22,11 @@
           const container = document.querySelector('.container')
           const mainContainer = document.querySelector('.main-container')
           const splashContainer = document.querySelector('.splash-container')
-          const carbonAdsContainer = document.querySelector('.code-sponsor-widget')
+          const adsContainer = document.querySelector('.carbon-ads-widget')
 
           if (carbonAds && container) {
             if (splashContainer) {
-              carbonAdsContainer.appendChild(carbonAds)
+              adsContainer.appendChild(carbonAds)
             } else if (mainContainer) {
               mainContainer.insertBefore(carbonAds, mainContainer.firstChild)
             } else {
@@ -39,42 +37,18 @@
           }
         }, 50)
       },
-      appendCodeSponsor() {
-        const interval = window.setInterval(() => {
-          const carbonAds = document.querySelector('.code-sponsor-widget')
-          const container = document.querySelector('.container')
-          const mainContainer = document.querySelector('.main-container')
-
-          if (carbonAds && mainContainer) {
-            if (mainContainer) {
-              mainContainer.appendChild(carbonAds)
-            } else {
-              container.appendChild(carbonAds)
-            }
-
-            window.clearInterval(interval)
-          }
-        }, 50)
-      },
       moveCarbonAdsToBody() {
         if (this.carbonEl) {
           document.body.appendChild(this.carbonEl)
         }
-      },
-      moveCodeSponsorToBody() {
-        if (this.codeSponsorEl) {
-          document.body.appendChild(this.codeSponsorEl)
-        }
       }
     },
     mounted () {
       this.saveAdsElements()
       this.appendCarbonAds()
-      this.appendCodeSponsor()
     },
     beforeDestroy() {
       this.moveCarbonAdsToBody()
-      this.moveCodeSponsorToBody()
     }
   }
 </script>
@@ -86,8 +60,7 @@
   $ad-responsive-small: 600px;
 
   @mixin ad-theme ($hue, $color) {
-    #carbonads,
-    .code-sponsor-widget {
+    #carbonads {
       background: md-get-palette-color(grey, $hue);
     }
 
@@ -212,26 +185,8 @@
     }
   }
 
-  .code-sponsor-widget {
-    margin-top: 64px;
-    padding: 10px;
-    display: flex;
-    justify-content: center;
-
-    @media (max-width: $ad-responsive-small) {
-      align-items: center;
-      flex-direction: column;
-    }
-
-    .splash-container & {
-      width: calc(100% + 32px);
-      margin: 0 -16px -16px;
-      background: #fff;
-    }
-
+  .carbon-ads-widget {
     #carbonads {
-      margin-left: 16px;
-
       @media (max-width: $ad-responsive-small) {
         margin-top: 16px;
         margin-left: 0;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-material",
   "description": "Material Design for Vue.js",
-  "version": "1.0.0-beta-5",
+  "version": "1.0.0-beta-4",
   "license": "MIT",
   "author": {
     "name": "marcosmoura",

src/components/MdButton/MdButton.vue

@@ -153,7 +153,7 @@
       }
     }
 
-    &.md-plain.md-button:not([disabled]) {
+    &.md-plain.md-button.md-raised:not([disabled]) {
       color: rgba(#000, .87);
       background-color: #fff;
 

yarn.lock

@@ -6314,6 +6314,12 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
+script-ext-html-webpack-plugin@^1.8.8:
+  version "1.8.8"
+  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.8.tgz#faa888a286ce746fcd06a5e0a9e39ed7b9d24f66"
+  dependencies:
+    debug "^3.1.0"
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"