diff --git a/assets/iview.png b/assets/iview.png index 5379c75..da21c2c 100644 Binary files a/assets/iview.png and b/assets/iview.png differ diff --git a/package.json b/package.json index ae8b440..4348480 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iview", - "version": "0.9.9", + "version": "0.9.10-rc-1", "title": "iView", "description": "A high quality UI components Library with Vue.js", "homepage": "http://www.iviewui.com", diff --git a/src/components/menu/menu.vue b/src/components/menu/menu.vue index 3472f8e..16f1746 100644 --- a/src/components/menu/menu.vue +++ b/src/components/menu/menu.vue @@ -41,11 +41,14 @@ }, computed: { classes () { + let theme = this.theme; + if (this.mode === 'vertical' && this.theme === 'primary') theme = 'light'; + return [ `${prefixCls}`, + `${prefixCls}-${theme}`, { - [`${prefixCls}-${this.mode}`]: this.mode, - [`${prefixCls}-${this.theme}`]: this.mode === 'horizontal' || (this.mode === 'vertical' && this.theme !== 'primary') + [`${prefixCls}-${this.mode}`]: this.mode } ] } diff --git a/src/components/menu/submenu.vue b/src/components/menu/submenu.vue index cdeedb8..db4dbb7 100644 --- a/src/components/menu/submenu.vue +++ b/src/components/menu/submenu.vue @@ -102,7 +102,7 @@ }, events: { 'on-menu-item-select' () { - this.opened = false; + if (this.mode === 'horizontal') this.opened = false; return true; } } diff --git a/src/styles/components/menu.less b/src/styles/components/menu.less index ab28ada..d281db2 100644 --- a/src/styles/components/menu.less +++ b/src/styles/components/menu.less @@ -193,7 +193,7 @@ } &-dark&-vertical &-submenu &-item{ &:hover{ - background: @title-color; + color: #fff; } &-active{ border-right: none; -- libgit2 0.21.4