🔀 Merge develop

posva · Feb 9, 2017 · c8a918d · c8a918d
2 parents 5363e73 + 1719a8b
commit c8a918d
Show file tree

Hide file tree

Showing 60 changed files with 2,346 additions and 2,639 deletions.
diff --git a/dist/doc-bundle.js b/dist/doc-bundle.js
diff --git a/dist/index.html b/dist/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html> <html lang=en> <head> <title>Vue MDL Documentation</title> <meta http-equiv=Content-Type content="text/html; charset=UTF-8"> <meta http-equiv=X-UA-Compatible content="IE=edge"> <meta name=viewport content="width=device-width,initial-scale=1"> <link href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&lang=en" rel=stylesheet type=text/css> <link rel=stylesheet href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel=stylesheet href=https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css> <link rel=icon href=doc/favicon.ico> </head> <body> <div id=app></div> <script src=https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js></script> <script type="text/javascript" src="doc-bundle.js"></script></body> </html>
diff --git a/dist/vue-mdl.js b/dist/vue-mdl.js
diff --git a/dist/vue-mdl.js.map b/dist/vue-mdl.js.map
diff --git a/dist/vue-mdl.min.js b/dist/vue-mdl.min.js
diff --git a/dist/vue-mdl.min.js.map b/dist/vue-mdl.min.js.map
diff --git a/doc/src/App.vue b/doc/src/App.vue
@@ -9,7 +9,7 @@
         <div class="mdl-layout__header-row">
           <span class="header-title">
             <img class="mdl-layout__header-logo"
-                 src="http://vuejs.org/images/logo.png"/>
+                 src="https://vuejs.org/images/logo.png"/>
             <router-link to="/"
                          class="u-no-text-decoration"
             >Vue MDL</router-link>
@@ -71,6 +71,7 @@ export default {
           name: 'Components',
           icon: 'extension',
           items: [
+            'Badges',
             'Buttons',
             'Cards',
             'Checkboxes',
@@ -96,10 +97,9 @@ export default {
           ]
         },
         {
-          name: 'Directives',
-          icon: 'settings_ethernet',
+          name: 'Misc',
+          icon: 'style',
           items: [
-            'Badges',
             'Ripple Effect'
           ]
         }

diff --git a/doc/src/VmdlDoc.vue b/doc/src/VmdlDoc.vue
@@ -125,6 +125,7 @@ export default {
         name: 'Components',
         icon: 'extension',
         items: [
+          'Badges',
           'Buttons',
           'Cards',
           'Checkboxes',
@@ -152,7 +153,6 @@ export default {
         name: 'Directives',
         icon: 'settings_ethernet',
         items: [
-          'Badges',
           'Ripple Effect'
         ]
       }]

diff --git a/doc/src/partials/badges.vue b/doc/src/partials/badges.vue
diff --git a/doc/src/partials/dialogs.vue b/doc/src/partials/dialogs.vue
diff --git a/doc/src/partials/icon-toggles.vue b/doc/src/partials/icon-toggles.vue
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!DOCTYPE html> <html lang=en> <head> <title>Vue MDL Documentation</title> <meta http-equiv=Content-Type content="text/html; charset=UTF-8"> <meta http-equiv=X-UA-Compatible content="IE=edge"> <meta name=viewport content="width=device-width,initial-scale=1"> <link href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&lang=en" rel=stylesheet type=text/css> <link rel=stylesheet href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel=stylesheet href=https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css> <link rel=icon href=doc/favicon.ico> </head> <body> <div id=app></div> <script src=https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js></script> <script type="text/javascript" src="doc-bundle.js"></script></body> </html>