From fb97a6d1a4504ecb26fb2c2b85c2988e83bb0496 Mon Sep 17 00:00:00 2001 From: eyunhua Date: Fri, 9 Mar 2018 18:48:31 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpagination=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=8C=89=E9=92=AE=E9=BB=98=E8=AE=A4=E6=97=A0=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E8=89=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pagination.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/pagination.less b/src/components/pagination.less index 909c7d6..80615f3 100644 --- a/src/components/pagination.less +++ b/src/components/pagination.less @@ -132,6 +132,7 @@ border: 1px solid @veui-middle-gray-color4; border-radius: @veui-border-radius-normal; margin-left: @interval-size; + background: @veui-light-gray-color5; &:first-child { margin-left: 0; } @@ -216,6 +217,7 @@ line-height: @button-height; border: 0 none; font-size: @veui-font-size-normal; + background: transparent; &:hover, &.veui-active { From 57de92d16e96928435f769d88254bc88f3c344a0 Mon Sep 17 00:00:00 2001 From: eyunhua Date: Fri, 9 Mar 2018 19:25:11 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9calendar=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=BF=BB=E9=A1=B5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons.json | 20 ++++++++++++++++++++ src/assets/icons/calendar-angle-left.svg | 12 ++++++++++++ src/assets/icons/calendar-angle-right.svg | 12 ++++++++++++ src/components/Calendar.js | 8 ++++---- src/icons/calendar-angle-left.js | 13 +++++++++++++ src/icons/calendar-angle-right.js | 13 +++++++++++++ src/icons/index.js | 2 ++ 7 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 src/assets/icons/calendar-angle-left.svg create mode 100644 src/assets/icons/calendar-angle-right.svg create mode 100644 src/icons/calendar-angle-left.js create mode 100644 src/icons/calendar-angle-right.js diff --git a/src/assets/icons.json b/src/assets/icons.json index ab9a23f..ce967af 100644 --- a/src/assets/icons.json +++ b/src/assets/icons.json @@ -165,6 +165,26 @@ } ] }, + "calendar-angle-left": { + "width": "6", + "height": "11", + "paths": [ + { + "d": "M.15 4.95a.95.95 0 0 1 .24-1L4.16.3a1.02 1.02 0 0 1 1.41 0c.4.38.4 1 0 1.37L2.1 5.06l3.6 3.5a1 1 0 0 1 0 1.43c-.41.4-1.07.4-1.48 0L.3 6.17a.98.98 0 0 1-.14-1.22z", + "fill-rule": "evenodd" + } + ] + }, + "calendar-angle-right": { + "width": "6", + "height": "11", + "paths": [ + { + "d": "M5.84 4.95a.95.95 0 0 0-.24-1L1.83.3A1.02 1.02 0 0 0 .42.3a.96.96 0 0 0 0 1.37l3.48 3.4-3.6 3.5A1 1 0 0 0 .3 10c.41.4 1.07.4 1.48 0L5.7 6.17a.98.98 0 0 0 .14-1.22z", + "fill-rule": "evenodd" + } + ] + }, "calendar": { "width": "13", "height": "14", diff --git a/src/assets/icons/calendar-angle-left.svg b/src/assets/icons/calendar-angle-left.svg new file mode 100644 index 0000000..55043a7 --- /dev/null +++ b/src/assets/icons/calendar-angle-left.svg @@ -0,0 +1,12 @@ + + + + chevron + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/calendar-angle-right.svg b/src/assets/icons/calendar-angle-right.svg new file mode 100644 index 0000000..d294b5b --- /dev/null +++ b/src/assets/icons/calendar-angle-right.svg @@ -0,0 +1,12 @@ + + + + chevron + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/src/components/Calendar.js b/src/components/Calendar.js index 453ed04..98594d7 100644 --- a/src/components/Calendar.js +++ b/src/components/Calendar.js @@ -1,12 +1,12 @@ -import '../icons/angle-left' +import '../icons/calendar-angle-left' import '../icons/angle-down-small' -import '../icons/angle-right' +import '../icons/calendar-angle-right' import config from 'veui/managers/config' config.defaults({ 'calendar.icons': { - prev: 'angle-left', - next: 'angle-right', + prev: 'calendar-angle-left', + next: 'calendar-angle-right', expand: 'angle-down-small', } }) diff --git a/src/icons/calendar-angle-left.js b/src/icons/calendar-angle-left.js new file mode 100644 index 0000000..4e4ac00 --- /dev/null +++ b/src/icons/calendar-angle-left.js @@ -0,0 +1,13 @@ +import Icon from 'veui/components/Icon' +Icon.register({ + "calendar-angle-left": { + "width": "6", + "height": "11", + "paths": [ + { + "d": "M.15 4.95a.95.95 0 0 1 .24-1L4.16.3a1.02 1.02 0 0 1 1.41 0c.4.38.4 1 0 1.37L2.1 5.06l3.6 3.5a1 1 0 0 1 0 1.43c-.41.4-1.07.4-1.48 0L.3 6.17a.98.98 0 0 1-.14-1.22z", + "fill-rule": "evenodd" + } + ] + } +}) diff --git a/src/icons/calendar-angle-right.js b/src/icons/calendar-angle-right.js new file mode 100644 index 0000000..81830da --- /dev/null +++ b/src/icons/calendar-angle-right.js @@ -0,0 +1,13 @@ +import Icon from 'veui/components/Icon' +Icon.register({ + "calendar-angle-right": { + "width": "6", + "height": "11", + "paths": [ + { + "d": "M5.84 4.95a.95.95 0 0 0-.24-1L1.83.3A1.02 1.02 0 0 0 .42.3a.96.96 0 0 0 0 1.37l3.48 3.4-3.6 3.5A1 1 0 0 0 .3 10c.41.4 1.07.4 1.48 0L5.7 6.17a.98.98 0 0 0 .14-1.22z", + "fill-rule": "evenodd" + } + ] + } +}) diff --git a/src/icons/index.js b/src/icons/index.js index ba16c1d..20881b2 100644 --- a/src/icons/index.js +++ b/src/icons/index.js @@ -15,6 +15,8 @@ import './arrow-left' import './arrow-right' import './arrow-up' import './bold-angle-right' +import './calendar-angle-left' +import './calendar-angle-right' import './calendar' import './check-circle-o-large' import './check-circle-o' From 3bfa6059aeb1959e2359234d5907b3c08dbb5365 Mon Sep 17 00:00:00 2001 From: eyunhua Date: Sun, 11 Mar 2018 09:25:22 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecalendar=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/components/Calendar.vue | 2 +- src/components/calendar.less | 91 +++++++++++++++--------------------- 2 files changed, 38 insertions(+), 55 deletions(-) diff --git a/demo/components/Calendar.vue b/demo/components/Calendar.vue index 9001636..cf430fe 100644 --- a/demo/components/Calendar.vue +++ b/demo/components/Calendar.vue @@ -78,7 +78,7 @@ export default { .veui-calendar { float: left; - margin-right: 10px; + margin: 10px; &-weekend:not(.veui-calendar-selected) { button { diff --git a/src/components/calendar.less b/src/components/calendar.less index acb7140..4a08926 100644 --- a/src/components/calendar.less +++ b/src/components/calendar.less @@ -1,13 +1,18 @@ @import "../lib.less"; +@page-color: #4DA1FF; // Calendar翻页按钮颜色 +@date-btn-bg: tint(#4DA1FF, 90%); // 每个日期的背景色 +@week-font-color: #808080; // 日期字体颜色 +@week-font-size: 11px; // 日期字体大小 +@select-btn-bg: tint(#F4F7F9, 60%); // 下拉选择按钮背景色 +@select-btn-border-color: tint(@veui-middle-gray-color4, 50%); // 下拉选择按钮边框颜色 + .veui-calendar { display: inline-block; overflow: hidden; - border: 1px solid @veui-gray-color-6; - background-color: #fff; - + background: @veui-light-gray-color5; box-shadow: 0 1px 7px 0 rgba(0,0,0,0.14); - color: @veui-gray-color-3; + color: @veui-dark-gray-color3; outline: none; button { @@ -25,16 +30,9 @@ } .veui-calendar-body { - border-left: 1px solid #fff; + border-left: 1px solid @veui-light-gray-color5; } } - - &::before { - //content: ""; - .absolute(36px, 0, _, 0); - height: 0; - border-bottom: 1px solid @veui-gray-color-6; - } } &-days + &-months, @@ -42,7 +40,7 @@ &-months + &-days, &-years + &-days { .veui-calendar-body { - border-color: @veui-gray-color-6; + // border-color: @veui-gray-color-6; } } @@ -61,26 +59,25 @@ margin-top: 1px; border: none; padding: 0; - background-color: #fff; - color: @veui-gray-color-3; + background: @veui-light-gray-color5; + color: @veui-dark-gray-color3; text-align: center; outline: none; &:hover, &.focus-visible { - background-color: @veui-brand-color-10; - color: @veui-text-color-strong; + background-color: @date-btn-bg; } &:active { - background-color: @veui-brand-color-9; + background-color: @date-btn-bg; } &:disabled { &, &:hover { - background-color: #fff; - color: @veui-gray-color-5; + background: @veui-light-gray-color5; + color: @veui-middle-gray-color3; cursor: not-allowed; } } @@ -89,9 +86,9 @@ th { .size(36px, 34px); - background-color: #fff; - color: #808080; - font-size: 11px; + background: @veui-light-gray-color5; + color: @week-font-color; + font-size: @week-font-size; font-weight: @veui-font-weight-normal; } @@ -99,7 +96,7 @@ position: relative; .size(36px, 30px); padding: 0; - color: @veui-text-color-normal; + color: @veui-text-color; } th, @@ -109,7 +106,7 @@ &-aux { button { - color: @veui-text-color-aux; + color: @veui-middle-gray-color1; } } @@ -122,17 +119,16 @@ &-selected, &-in-range { button { - //background-color: @veui-brand-color-8; background: rgba(77,161,255,0.10); - border-radius: 4px; + border-radius: @veui-border-radius-normal; &:hover, &.focus-visible { - background-color: @veui-brand-color-7; + background-color: @date-btn-bg; } &:active { - background-color: @veui-brand-color-6; + background-color: @date-btn-bg; } } } @@ -144,7 +140,7 @@ width: 234px; button { - color: @veui-gray-color-3; + color: @veui-dark-gray-color3; height: 28px; background: none; border: none; @@ -153,55 +149,42 @@ cursor: pointer; b { font-weight: @veui-font-weight-normal; + vertical-align: middle; + font-size: @veui-font-size-normal; } .veui-icon { width: 16px; vertical-align: middle; - color: @veui-theme-color; - } - - &:hover, - &.focus-visible { - background-color: @veui-gray-color-8; - color: @veui-text-color-strong; + color: @page-color; } &.veui-calendar-select { - background: #fbfcfd; - border: 1px solid rgba(217,217,217,0.50); - border-radius: 4px; + background: @select-btn-bg; + border: 1px solid @select-btn-border-color; + border-radius: @veui-border-radius-normal; margin: auto 2px; min-width: 52px; .veui-icon { - color: inherit; + color: @veui-dark-gray-color3; margin-left: -18px; - background: #fbfcfd; + background: @select-btn-bg; height: 100%; display: inline-block; } } - &:active { - //background-color: @veui-gray-color-6; - color: @veui-text-color-normal; - - .veui-icon { - color: inherit; - } - } - &:disabled { &, &:hover { - color: @veui-text-color-aux; + color: @veui-middle-gray-color1; background: transparent; cursor: not-allowed; } .veui-icon { color: inherit; - background: #fff; + background: @veui-light-gray-color5; } } } @@ -209,7 +192,7 @@ &-label { line-height: 36px; - color: @veui-gray-color-3; + color: @veui-dark-gray-color3; } &-prev, From d137b47c72f29dd545234c509cdb34d80e55b4f4 Mon Sep 17 00:00:00 2001 From: eyunhua Date: Sun, 11 Mar 2018 09:36:20 +0800 Subject: [PATCH 04/11] =?UTF-8?q?bug=20fixed:=E4=BF=AE=E5=A4=8Dcheckbox?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8C=89=E9=92=AE=E5=92=8Cbig=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E5=A4=A7=E5=B0=8F=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/checkbox.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/checkbox.less b/src/components/checkbox.less index 3b5c9a5..fa65849 100644 --- a/src/components/checkbox.less +++ b/src/components/checkbox.less @@ -2,13 +2,13 @@ .veui-checkbox { @size: 14px; // 复选框大小 @small-size: 12px; // ui=small复选框大小 - @big-size: 14px; // ui=big下的复选框大小 + @big-size: 16px; // ui=big下的复选框大小 @radius: 2px; // 圆角大小 @bg-color: #5E9BFB; // 选中背景颜色 display: inline-block; color: @veui-dark-gray-color3; - font-size: @veui-font-size-small; + font-size: @veui-font-size-normal; line-height: @veui-font-size-large; cursor: pointer; From 943260ca892d2bf48a95c4b30115c6eb1a37957d Mon Sep 17 00:00:00 2001 From: eyunhua Date: Sun, 11 Mar 2018 21:32:05 +0800 Subject: [PATCH 05/11] =?UTF-8?q?checkboxGroup=E7=BB=84=E4=BB=B6demo?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0small=E3=80=81large=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/components/CheckboxGroup.vue | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/demo/components/CheckboxGroup.vue b/demo/components/CheckboxGroup.vue index 4a8cd53..02cd114 100644 --- a/demo/components/CheckboxGroup.vue +++ b/demo/components/CheckboxGroup.vue @@ -1,18 +1,36 @@ @@ -28,6 +46,7 @@ export default { return { picked1: ['Hirasawa Yui', 'Akiyama Mio'], picked2: [], + picked3: [], data1: [ { value: 'Hirasawa Yui', label: 'Hirasawa Yui' @@ -49,6 +68,17 @@ export default { { value: 'Nakano Azusa', label: 'Nakano Azusa' } + ], + data3: [ + { + value: 'Hirasawa Yui', label: 'Hirasawa Yui' + }, + { + value: 'Akiyama Mio', label: 'Akiyama Mio' + }, + { + value: 'Nakano Azusa', label: 'Nakano Azusa' + } ] } } From 1fc814c98be4aefd734c677cd5a65752cbbff770 Mon Sep 17 00:00:00 2001 From: eyunhua Date: Sun, 11 Mar 2018 22:16:29 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=96=B0=E5=A2=9Eradio=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/components/Radio.vue | 17 +++------- src/components/radio.less | 65 +++++++++++++++------------------------ 2 files changed, 29 insertions(+), 53 deletions(-) diff --git a/demo/components/Radio.vue b/demo/components/Radio.vue index ff4b402..ed8af8b 100644 --- a/demo/components/Radio.vue +++ b/demo/components/Radio.vue @@ -4,27 +4,18 @@

正常状态

-

- 正常状态 -

选中状态

-

- 选中状态 -

-

+

- 选中无效状态 + 选中无效状态

未选无效状态

-

- 未选无效状态 -

@@ -39,7 +30,7 @@ export default { data () { return { a1: false, - a2: false + a2: true } } } diff --git a/src/components/radio.less b/src/components/radio.less index b0252dc..2aa6f8e 100644 --- a/src/components/radio.less +++ b/src/components/radio.less @@ -1,10 +1,10 @@ @import "../lib.less"; +@radio-size: 12px; +@disabled-color: #108EE9; // disabled状态color色值 + .veui-radio { display: inline-block; - color: @veui-text-color-normal; - font-size: @veui-font-size-normal; - line-height: @veui-font-size-large; cursor: pointer; input { @@ -18,8 +18,9 @@ &-label, &-box { - vertical-align: top; + vertical-align: middle; display: inline-block; + color: @veui-dark-gray-color3; } .veui-field > & { @@ -33,32 +34,31 @@ & :focus ~ &-box, & :focus ~ &-label, &:hover { - color: @veui-text-color-strong; + color: @veui-dark-gray-color3; } &-box { position: relative; - height: @veui-font-size-large; - width: @veui-font-size-large; - border: 1px solid @veui-gray-color-2; - background-color: #fff; - margin-right: 8px; + .size(@radio-size); + border: 1px solid @veui-middle-gray-color4; + background: @veui-light-gray-color5; + margin-right: 7px; border-radius: 50%; - font-size: @veui-font-size-normal; + font-size: @veui-font-size-small; } &:hover &-box { - border-color: @veui-gray-color-1; + border-color: @veui-theme-color; } & :checked + &-box { - border-color: @veui-gray-color-1; + border-color: @veui-theme-color; &::before { content: ""; display: block; - .size(@veui-font-size-large); - background-color: @veui-gray-color-1; + .size(@radio-size); + background: @veui-theme-color; border-radius: 50%; .absolute(50%, 50%); transform: translate(-50%, -50%) scale(.5); @@ -69,40 +69,25 @@ cursor: not-allowed; .veui-radio-label { - color: @veui-text-color-weak; + color: @veui-dark-gray-color3; } - } - - & :disabled + &-box { - border-color: @veui-gray-color-5; - background-color: @veui-gray-color-7; - &::before { - background-color: @veui-gray-color-5; + .veui-radio-box { + background: @veui-light-gray-color4; } - } - &[ui~="small"] { - font-size: @veui-font-size-small; - line-height: @veui-font-size-small; - } - - .veui-field[ui~="small"] > &[ui~="small"] { - line-height: @veui-height-small; - - .veui-radio-box { - vertical-align: -2px; + &:hover .veui-radio-box { + border-color: @veui-middle-gray-color4; } } - &[ui~="small"] &-box { - margin-right: 6px; - font-size: @veui-font-size-small; - height: @veui-font-size-small; - width: @veui-font-size-small; + & :checked:disabled + &-box { + background-color: @veui-light-gray-color1; + border-color: @disabled-color; + opacity: 0.4; &::before { - .size(@veui-font-size-small); + background-color: @disabled-color; } } } From 7f2001999e10f975707c9728912695b76d41aa6e Mon Sep 17 00:00:00 2001 From: eyunhua Date: Sun, 11 Mar 2018 22:18:32 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9radioGroup=E7=BB=84?= =?UTF-8?q?=E4=BB=B6demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/components/RadioGroup.vue | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/demo/components/RadioGroup.vue b/demo/components/RadioGroup.vue index fcac267..b4e9dfe 100644 --- a/demo/components/RadioGroup.vue +++ b/demo/components/RadioGroup.vue @@ -7,12 +7,6 @@

value: {{ picked1 }}

-

- - - -

-

value: {{ picked2 }}

@@ -27,7 +21,6 @@ export default { data () { return { picked1: null, - picked2: 'Nakano Azusa', data1: [ { value: 'Hirasawa Yui', label: 'Hirasawa Yui' @@ -38,17 +31,6 @@ export default { { value: 'Nakano Azusa', label: 'Nakano Azusa' } - ], - data2: [ - { - value: 'Hirasawa Yui', label: 'Hirasawa Yui' - }, - { - value: 'Akiyama Mio', label: 'Akiyama Mio' - }, - { - value: 'Nakano Azusa', label: 'Nakano Azusa' - } ] } } From 924c0a43918566aeaa05bb5598225db61b478390 Mon Sep 17 00:00:00 2001 From: eyunhua Date: Sun, 11 Mar 2018 22:23:22 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=AE=8C=E5=96=84steps=E7=BB=84=E4=BB=B6?= =?UTF-8?q?demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/components/Steps.vue | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/demo/components/Steps.vue b/demo/components/Steps.vue index 93d287c..c65e646 100644 --- a/demo/components/Steps.vue +++ b/demo/components/Steps.vue @@ -6,19 +6,30 @@

-

默认样式：

+

+ 默认样式： + ui="vertical"（纵向样式，不传ui则默认为横向样式） +

-

多行样式：

+

+ 多行样式： + ui="full" +

-

小型样式：

+

+ 小型样式： + ui="small" +

-

自定义模板：

+

+ 自定义模板： +

From 78d5113d22b8b060eab06c913872d9b25de10862 Mon Sep 17 00:00:00 2001 From: eyunhua Date: Mon, 12 Mar 2018 10:17:33 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=96=B0=E5=A2=9Esearchbox=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/components/Searchbox.vue | 58 ++++++++++++++++++-- src/components/searchbox.less | 100 +++++++++++++++++++++++++--------- src/dropdown.less | 12 ++-- 3 files changed, 134 insertions(+), 36 deletions(-) diff --git a/demo/components/Searchbox.vue b/demo/components/Searchbox.vue index 6d14fe5..96af0c2 100644 --- a/demo/components/Searchbox.vue +++ b/demo/components/Searchbox.vue @@ -3,12 +3,38 @@

<veui-searchbox>

普通

+

+ 小尺寸： + ui="small" +

+

+ +

+

+ 默认尺寸： + 不传ui +

+

+ 大尺寸： + ui="large" +

+

+ +

禁用

@@ -37,7 +63,11 @@

-

小ui模式

+

ui模式：类型ui="primary"

+

+ 小尺寸： + ui="small" +

-
-
-

大ui模式

+

+ 默认尺寸： + 不传ui +

+

+ +

+

+ 大尺寸： + ui="large" +

全局搜索框

禁用全局搜索框

Date: Mon, 12 Mar 2018 10:48:05 +0800 Subject: [PATCH 10/11] =?UTF-8?q?demo=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/App.vue | 18 ++++++++- demo/components/index.js | 84 ++++++++++++++++++++++++++-------------- 2 files changed, 73 insertions(+), 29 deletions(-) diff --git a/demo/App.vue b/demo/App.vue index 9d90bd7..f5c5e78 100644 --- a/demo/App.vue +++ b/demo/App.vue @@ -3,7 +3,13 @@

@@ -124,6 +130,15 @@ export default { &:hover { font-weight: 500; } + .gray { + color: #333; + } + .red { + color: #ff0000; + } + .orange { + color: #FF701A; + } } } @@ -195,6 +210,7 @@ main { color: #666; border: 1px solid #d9d9d9; padding: 10px; + background: @veui-light-gray-color5; } .attrTab { .veui-table td { diff --git a/demo/components/index.js b/demo/components/index.js index 13271a8..382f93c 100644 --- a/demo/components/index.js +++ b/demo/components/index.js @@ -39,37 +39,44 @@ export default [ { path: '/alert', name: 'Alert', - component: Alert + component: Alert, + isComplete: true }, { path: '/breadcrumb', name: 'Breadcrumb', - component: Breadcrumb + component: Breadcrumb, + isComplete: true }, { path: '/button', name: 'Button', - component: Button + component: Button, + isComplete: true }, { path: '/button-group', name: 'ButtonGroup', - component: ButtonGroup + component: ButtonGroup, + isComplete: true }, { path: '/calendar', name: 'Calendar', - component: Calendar + component: Calendar, + isComplete: true }, { path: '/carousel', name: 'Carousel', - component: Carousel + component: Carousel, + isComplete: 'noDev' }, { path: '/checkbox', name: 'Checkbox', - component: Checkbox + component: Checkbox, + isComplete: true }, { path: '/check-button-group', @@ -79,7 +86,8 @@ export default [ { path: '/checkbox-group', name: 'CheckboxGroup', - component: CheckboxGroup + component: CheckboxGroup, + isComplete: true }, { path: '/date-picker', @@ -89,42 +97,50 @@ export default [ { path: '/dialog', name: 'Dialog', - component: Dialog + component: Dialog, + isComplete: 'noUi' }, { path: '/dropdown', name: 'Dropdown', - component: Dropdown + component: Dropdown, + isComplete: true }, { path: '/form', name: 'Form', - component: Form + component: Form, + isComplete: 'noUi' }, { path: '/font', name: 'Font', - component: Font + component: Font, + isComplete: true }, { path: '/icon', name: 'Icon', - component: Icon + component: Icon, + isComplete: true }, { path: '/input', name: 'Input', - component: Input + component: Input, + isComplete: true }, { path: '/overlay', name: 'Overlay', - component: Overlay + component: Overlay, + isComplete: 'noDev' }, { path: '/pagination/:page?', name: 'Pagination', - component: Pagination + component: Pagination, + isComplete: true }, { path: '/progress', @@ -134,7 +150,8 @@ export default [ { path: '/radio', name: 'Radio', - component: Radio + component: Radio, + isComplete: true }, { path: '/radio-button-group', @@ -144,27 +161,32 @@ export default [ { path: '/radio-group', name: 'RadioGroup', - component: RadioGroup + component: RadioGroup, + isComplete: true }, { path: '/region-picker', name: 'RegionPicker', - component: RegionPicker + component: RegionPicker, + isComplete: 'noDev' }, { path: '/schedule', name: 'Schedule', - component: Schedule + component: Schedule, + isComplete: 'noDev' }, { path: '/slider', name: 'Slider', - component: Slider + component: Slider, + isComplete: 'noDev' }, { path: '/searchbox', name: 'Searchbox', - component: Searchbox + component: Searchbox, + isComplete: true }, { path: '/select', @@ -174,7 +196,8 @@ export default [ { path: '/steps', name: 'Steps', - component: Steps + component: Steps, + isComplete: true }, { path: '/switch', @@ -184,7 +207,8 @@ export default [ { path: '/table', name: 'Table', - component: Table + component: Table, + isComplete: 'noUi' }, { path: '/tabs', @@ -204,12 +228,14 @@ export default [ path: 'progress', component: Progress } - ] + ], + isComplete: 'noUi' }, { path: '/textarea', name: 'Textarea', - component: Textarea + component: Textarea, + isComplete: true }, { path: '/toast', @@ -224,11 +250,13 @@ export default [ { path: '/transfer', name: 'Transfer', - component: Transfer + component: Transfer, + isComplete: 'noDev' }, { path: '/uploader', name: 'Uploader', - component: Uploader + component: Uploader, + isComplete: true } ] From 0745fa73c058cff235ce0a7edb77cce3ed5f718d Mon Sep 17 00:00:00 2001 From: eyunhua Date: Mon, 12 Mar 2018 10:49:33 +0800 Subject: [PATCH 11/11] v0.4.0 changelog --- CHANGELOG.md | 16 ++++++++++++++++ package.json | 2 +- src/package.json | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9743fab..a7a7c70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## 0.4.0-dev + +### 💡 主要变更 + +* [+] 新增 `Calendar` 组件样式。 +* [+] 新增 ` Radio` 组件样式。 +* [+] 新增 ` Steps` 组件样式。 +* [+] 新增 ` Searchbox` 组件样式。 +* [+] `CheckboxGroup` 组件demo增加small、large类型样式。 +* [^] 更新 `RadioGroup` 组件demo + +### 🐞 问题修复 + +* [^] 修复 `pagination` 组件按钮默认无背景色问题。 +* [^] 修复 `checkbox` 组件默认样式和large样式不符合规范问题 + ## 0.3.0-dev ### 💡 主要变更 diff --git a/package.json b/package.json index df37741..101a3f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "veui-theme-blue", - "version": "0.3.0-dev", + "version": "0.4.0-dev", "description": "blue Theme for VEUI", "author": "BI FE", "private": false, diff --git a/src/package.json b/src/package.json index 97dfba7..d16ae89 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "veui-theme-blue", - "version": "0.3.0-dev", + "version": "0.4.0-dev", "description": "blue theme for VEUI.", "scripts": { "icons": "node build/svg2json.js && node build/icons.js"