2.0.0-alpha.2

museui · Nov 12, 2016 · bcee45c · bcee45c
1 parent 8b9a44a
commit bcee45c
Show file tree

Hide file tree

Showing 31 changed files with 303 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ npm install muse-ui -save
 ```javascript
 import Vue from 'vue'
 import MuseUI from 'muse-ui'
+import 'muse-ui/dist/muse-ui.css'
 Vue.use(MuseUI)
 ```
 

diff --git a/dist/muse-ui.css b/dist/muse-ui.css
diff --git a/dist/muse-ui.js b/dist/muse-ui.js
diff --git a/dist/theme-carbon.css b/dist/theme-carbon.css
@@ -18,6 +18,14 @@
   background-color: #ff5252;
   color: #ffffff;
 }
+body {
+  background-color: #ffffff;
+  color: #474a4f;
+  font-family: Roboto, Lato, sans-serif;
+}
+a {
+  color: #ff5252;
+}
 .mu-bottom-nav {
   background-color: #ffffff;
 }
@@ -36,14 +44,6 @@
 .mu-bottom-nav-shift .mu-bottom-item-active {
   color: #ffffff;
 }
-body {
-  background-color: #ffffff;
-  color: #474a4f;
-  font-family: Roboto, Lato, sans-serif;
-}
-a {
-  color: #ff5252;
-}
 .mu-bottom-sheet {
   background-color: #ffffff;
 }

diff --git a/dist/theme-carbon.min.css b/dist/theme-carbon.min.css
diff --git a/dist/theme-dark.css b/dist/theme-dark.css
@@ -18,6 +18,14 @@
   background-color: #ff4081;
   color: #303030;
 }
+body {
+  background-color: #303030;
+  color: #ffffff;
+  font-family: Roboto, Lato, sans-serif;
+}
+a {
+  color: #ff4081;
+}
 .mu-bottom-nav {
   background-color: #424242;
 }
@@ -36,14 +44,6 @@
 .mu-bottom-nav-shift .mu-bottom-item-active {
   color: #303030;
 }
-body {
-  background-color: #303030;
-  color: #ffffff;
-  font-family: Roboto, Lato, sans-serif;
-}
-a {
-  color: #ff4081;
-}
 .mu-bottom-sheet {
   background-color: #424242;
 }
@@ -120,7 +120,7 @@ a {
 }
 .mu-date-display {
   background-color: rgba(255, 255, 255, 0.12);
-  color: #303030;
+  color: #ffffff;
 }
 .mu-day-button-bg {
   background-color: #0288d1;
@@ -442,10 +442,10 @@ a {
   color: #ffffff;
 }
 .mu-tr.selected {
-  background-color: #f5f5f5;
+  background-color: rgba(255, 255, 255, 0.05);
 }
 .mu-tr.hover {
-  background-color: #eeeeee;
+  background-color: rgba(255, 255, 255, 0.1);
 }
 .mu-tr.stripe {
   background-color: rgba(211, 239, 255, 0.4);
@@ -506,7 +506,7 @@ a {
 }
 .mu-time-display {
   background-color: rgba(255, 255, 255, 0.12);
-  color: #303030;
+  color: #ffffff;
 }
 .mu-clock-number.selected {
   background-color: #0288d1;

diff --git a/dist/theme-dark.min.css b/dist/theme-dark.min.css
diff --git a/dist/theme-default.css b/dist/theme-default.css
@@ -18,6 +18,14 @@
   background-color: #ff4081;
   color: #ffffff;
 }
+body {
+  background-color: #ffffff;
+  color: rgba(0, 0, 0, 0.87);
+  font-family: Roboto, Lato, sans-serif;
+}
+a {
+  color: #ff4081;
+}
 .mu-bottom-nav {
   background-color: #ffffff;
 }
@@ -36,14 +44,6 @@
 .mu-bottom-nav-shift .mu-bottom-item-active {
   color: #ffffff;
 }
-body {
-  background-color: #ffffff;
-  color: rgba(0, 0, 0, 0.87);
-  font-family: Roboto, Lato, sans-serif;
-}
-a {
-  color: #ff4081;
-}
 .mu-bottom-sheet {
   background-color: #ffffff;
 }

diff --git a/dist/theme-default.min.css b/dist/theme-default.min.css
diff --git a/dist/theme-teal.css b/dist/theme-teal.css
@@ -18,6 +18,14 @@
   background-color: #ff4081;
   color: #ffffff;
 }
+body {
+  background-color: #ffffff;
+  color: rgba(0, 0, 0, 0.87);
+  font-family: Roboto, Lato, sans-serif;
+}
+a {
+  color: #ff4081;
+}
 .mu-bottom-nav {
   background-color: #ffffff;
 }
@@ -36,14 +44,6 @@
 .mu-bottom-nav-shift .mu-bottom-item-active {
   color: #ffffff;
 }
-body {
-  background-color: #ffffff;
-  color: rgba(0, 0, 0, 0.87);
-  font-family: Roboto, Lato, sans-serif;
-}
-a {
-  color: #ff4081;
-}
 .mu-bottom-sheet {
   background-color: #ffffff;
 }

diff --git a/dist/theme-teal.min.css b/dist/theme-teal.min.css
diff --git a/docs/version.json b/docs/version.json
@@ -1,3 +1,4 @@
 [
+  "2.0.0-alpha.2",
   "2.0.0-alpha.1"
 ]
diff --git a/less/theme-vars.less b/less/theme-vars.less
@@ -5,11 +5,6 @@
 @avatarColor: @alternateTextColor;
 @avatarBackgroundColor: darken(@alternateTextColor, 26%);
 
-@baseFontFamily: @fontFamily;
-@baseTextColor: @textColor;
-@baseBackgroundColor: @backgroundColor;
-@baseLinkColor: @accentColor;
-
 // badge
 @badgeColor: @lighterPrimaryColor;
 @badgeTextColor: @alternateTextColor;
@@ -18,6 +13,11 @@
 @badgeSecondaryColor: @accentColor;
 @badgeSecondaryTextColor: @alternateTextColor;
 
+@baseFontFamily: @fontFamily;
+@baseTextColor: @textColor;
+@baseBackgroundColor: @backgroundColor;
+@baseLinkColor: @accentColor;
+
 @bottomNavBackgroundColor: @dialogBackgroundColor;
 @bottomNavShiftBackgroundColor: @primaryColor;
 @bottomNavUnselectedColor: @secondaryTextColor;

diff --git a/less/theme.less b/less/theme.less
@@ -25,6 +25,16 @@
   color: @badgeSecondaryTextColor;
 }
 
+body {
+  background-color: @baseBackgroundColor;
+  color: @baseTextColor;
+  font-family: @baseFontFamily;
+}
+
+a {
+  color: @baseLinkColor;
+}
+
 .mu-bottom-nav {
   background-color: @bottomNavBackgroundColor;
 }
@@ -47,16 +57,6 @@
   }
 }
 
-body {
-  background-color: @baseBackgroundColor;
-  color: @baseTextColor;
-  font-family: @baseFontFamily;
-}
-
-a {
-  color: @baseLinkColor;
-}
-
 .mu-bottom-sheet {
   background-color: @bottomSheetColor;
 }
@@ -162,7 +162,7 @@ a {
 
 .mu-date-display{
   background-color: @datePickerHeaderColor;
-  color: @datePickerSelectTextColor;
+  color: @datePickerTextColor;
 }
 
 
@@ -684,7 +684,7 @@ a {
 
 .mu-time-display {
   background-color: @timePickerHeaderColor;
-  color: @timePickerSelectTextColor;
+  color: @timePickerColor;
 }
 
 .mu-clock-number{

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "muse-ui",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.2",
   "description": "material design ui for vue2",
   "main": "dist/muse-ui.js",
   "keywords": [

diff --git a/src-docs/App.vue b/src-docs/App.vue
@@ -106,7 +106,6 @@ function isDesktop () {
 
 .content-wrapper{
   padding: 48px 72px;
-  background-color: @alternateTextColor;
 }
 
 @media (min-width: 480px) {

diff --git a/src-docs/assets/atom-one-light.css b/src-docs/assets/atom-one-light.css
@@ -1,4 +1,5 @@
-.hljs {
+.hljs,
+[class^="lang-"], [class*=" lang-"] {
   display: block;
   overflow-x: auto;
   padding: 0.5em;

diff --git a/src-docs/assets/themes/theme.less b/src-docs/assets/themes/theme.less
@@ -2,6 +2,22 @@
   background-color: @primaryColor;
 }
 
+.mu-desc-wrapper{
+  background-color: fade(@alternateTextColor, 30%);
+}
+
+.exmaples-drawer{
+  border-right-color: @borderColor;
+}
+
+.exmaples-nav-appbar.mu-appbar{
+  background-color: @dialogBackgroundColor;
+  color: @secondaryTextColor;
+}
+.exmaples-appbar-title{
+  color: @secondaryTextColor;
+}
+
 
 .mu-logo{
   background-color: @alternateTextColor;
@@ -56,3 +72,39 @@
 .code-examples {
   background-color: @dialogBackgroundColor;
 }
+
+
+.markdown-body {
+  color: @textColor;
+}
+
+.markdown-body a {
+  color: @primaryColor;
+}
+
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+  color: @textColor;
+}
+
+.markdown-body h1 .octicon-link,
+.markdown-body h2 .octicon-link,
+.markdown-body h3 .octicon-link,
+.markdown-body h4 .octicon-link,
+.markdown-body h5 .octicon-link,
+.markdown-body h6 .octicon-link {
+  color: @textColor;
+}
+
+.markdown-body blockquote {
+  color: @secondaryTextColor;
+}
+
+
+.markdown-body img {
+  background-color: @alternateTextColor;
+}
diff --git a/src-docs/components/AppNavDrawer.vue b/src-docs/components/AppNavDrawer.vue
@@ -7,7 +7,7 @@
   <mu-divider/>
   <mu-flexbox class="mu-version-box" align="center">
     <span class="mu-version-text">Version: </span>
-    <mu-dropDown-menu :value="version" v-if="version">
+    <mu-dropDown-menu :value="version" @change="handleVersionChange" v-if="versions.length > 0">
       <mu-menu-item v-for="vtext in versions" :value="vtext" :title="vtext"/>
     </mu-dropDown-menu>
   </mu-flexbox>
@@ -95,6 +95,7 @@
 </template>
 
 <script>
+import packageJson from '../../package.json'
 export default {
   props: {
     open: {
@@ -109,11 +110,17 @@ export default {
   data () {
     return {
       menuVal: '#/',
-      version: '',
+      version: packageJson.version,
       versions: []
     }
   },
   methods: {
+    handleVersionChange (val) {
+      if (val !== this.version) {
+        var url = this.versions.indexOf(val) === 0 ? '/' : '/' + val
+        window.open(url)
+      }
+    },
     handleClose () {
       this.$emit('close')
     },
@@ -133,7 +140,6 @@ export default {
       if (xhr.readyState === 4) {
         if (xhr.status === 200) {
           this.versions = JSON.parse(xhr.responseText)
-          this.version = this.versions[0]
         } else {
           console.error(xhr.statusText)
         }
@@ -152,7 +158,7 @@ export default {
 }
 
 .exmaples-nav-appbar.mu-appbar{
-  background-color: #FFF;
+  background-color: @dialogBackgroundColor;
   color: @secondaryTextColor;
 }
 .exmaples-appbar-title{