diff --git a/components/_style/mixin/theme.basic.styl b/components/_style/mixin/theme.basic.styl index 7799c07de..89732299f 100644 --- a/components/_style/mixin/theme.basic.styl +++ b/components/_style/mixin/theme.basic.styl @@ -1,17 +1,17 @@ /// Brand Color -color-primary = #2F86F6 // 品牌色 +color-primary = #198cff // 品牌色 /// Text Color -color-text-base = #111A34 // 重要信息,如一级标题 +color-text-base = #01080F // 重要信息,如一级标题 color-text-base-inverse = #FFF color-text-body = #41485D // 普通信息,如正文主要内容 color-text-minor = #666f83 // 次要信息,如利益点、摘要 color-text-caption = #858B9C // 辅助信息,如列表内容描述 -color-text-disabled = #C5CAD5 // 禁用状态 +color-text-disabled = #D9E0E7 // 禁用状态 color-text-placeholder = #C5CAD5 // 默认提示输入或占位 color-text-highlight = color-primary // 高亮状态 -color-text-warn = #FF7D41 // 利益点,警告提示 -color-text-error = #FF5257 // 强提示报错 +color-text-warn = #FF4040 // 利益点,警告提示 +color-text-error = #FF4040 // 强提示报错 color-text-link = #5878B4 // 文字链接 /// Border & Background Color @@ -40,7 +40,7 @@ font-weight-medium = 500 font-weight-semibold = 600 /// Radius Size -radius-normal = 4px +radius-normal = 16px radius-circle = 50% /// Border Size diff --git a/components/_style/mixin/theme.components.styl b/components/_style/mixin/theme.components.styl index ae71bc511..7710f8f9d 100644 --- a/components/_style/mixin/theme.components.styl +++ b/components/_style/mixin/theme.components.styl @@ -39,11 +39,11 @@ button-default-fill = color-bg-inverse button-disabled-fill = color-bg-disabled button-warning-fill = color-text-error -button-primary-active-fill = #2A78DC +button-primary-active-fill = #167DE5 button-default-active-fill = color-bg-base button-warning-active-fill = #E9424F -button-primary-plain-active-fill = #EAF2FE +button-primary-plain-active-fill = #EBF5FF button-default-plain-active-fill = color-bg-base button-warning-plain-active-fill = #FAC3C6 @@ -214,7 +214,7 @@ icon-size-xs = 20px icon-size-sm = 24px icon-size-md = 32px icon-size-lg = 42px -icon-font-family = url("https://manhattan.didistatic.com/static/manhattan/mand-mobile/icon/2.0.2/iconfont.woff") format("woff"), url("https://manhattan.didistatic.com/static/manhattan/mand-mobile/icon/2.0.2/iconfont.ttf") format("truetype") +icon-font-family = url("https://manhattan.didistatic.com/static/manhattan/mand-mobile/icon/2.1.0/iconfont.woff") format("woff"), url("http://manhattan.didistatic.com/static/manhattan/mand-mobile/icon/2.1.0/iconfont.ttf") format("truetype") /// image-viewer image-viewer-index-font-size = 32px @@ -375,7 +375,7 @@ tab-bg = color-bg-base tab-height = 100px tab-ink-height = 3px tab-offset = h-gap-sl -tab-item-gap = h-gap-md +tab-item-gap = 27px /// tab-picker tab-picker-height = 500px diff --git a/components/action-bar/index.vue b/components/action-bar/index.vue index c2753e6df..45f5b654b 100644 --- a/components/action-bar/index.vue +++ b/components/action-bar/index.vue @@ -70,7 +70,7 @@ export default { bottom 0 right 0 display flex - padding action-bar-padding-v action-bar-padding-h + padding action-bar-padding-v action-bar-padding-h 36px background color-bg-inverse clearfix() @@ -79,7 +79,7 @@ export default { flex 1 padding-bottom constant(safe-area-inset-bottom) padding-bottom env(safe-area-inset-bottom) - + .md-action-bar-text display flex flex 1 diff --git a/components/button/demo/cases/demo4.vue b/components/button/demo/cases/demo4.vue index 07ef64f4c..d127e80fe 100644 --- a/components/button/demo/cases/demo4.vue +++ b/components/button/demo/cases/demo4.vue @@ -1,7 +1,7 @@ diff --git a/components/button/test/__snapshots__/demo.spec.js.snap b/components/button/test/__snapshots__/demo.spec.js.snap index b9c39f91d..9b7d5207e 100644 --- a/components/button/test/__snapshots__/demo.spec.js.snap +++ b/components/button/test/__snapshots__/demo.spec.js.snap @@ -160,7 +160,7 @@ exports[`Button Text link 1`] = ` `; diff --git a/components/button/test/cases/demo4.vue b/components/button/test/cases/demo4.vue index 76a085aef..cc75b52a3 100644 --- a/components/button/test/cases/demo4.vue +++ b/components/button/test/cases/demo4.vue @@ -1,7 +1,7 @@ diff --git a/components/cell-item/index.vue b/components/cell-item/index.vue index 4d34911dc..00c467095 100644 --- a/components/cell-item/index.vue +++ b/components/cell-item/index.vue @@ -22,7 +22,7 @@ {{ addon }} - +
@@ -116,7 +116,7 @@ export default { justify-content flex-end color cell-item-right-color font-size cell-item-right-font-size - .md-icon-arrow-right + .md-icon-arrow margin-left 6px margin-right -6px color color-text-placeholder diff --git a/components/cell-item/test/__snapshots__/demo.spec.js.snap b/components/cell-item/test/__snapshots__/demo.spec.js.snap index fc4d69d6c..51740a187 100644 --- a/components/cell-item/test/__snapshots__/demo.spec.js.snap +++ b/components/cell-item/test/__snapshots__/demo.spec.js.snap @@ -25,7 +25,7 @@ exports[`CellItem - Demo Basic 1`] = `
-
+ @@ -85,7 +85,7 @@ exports[`CellItem - Demo Content List 1`] = `
附加文案 -
+ @@ -98,7 +98,7 @@ exports[`CellItem - Demo Content List 1`] = `
附加文案 -
+ @@ -111,7 +111,7 @@ exports[`CellItem - Demo Content List 1`] = `
禁用的项目 -
+ @@ -124,7 +124,7 @@ exports[`CellItem - Demo Content List 1`] = `
-
+

@@ -152,7 +152,7 @@ exports[`CellItem - Demo Simple List 1`] = `

可用8000.34 -
+ @@ -209,7 +209,7 @@ exports[`CellItem - Demo Simple List 1`] = `
可用8000.34 -
+ @@ -224,7 +224,7 @@ exports[`CellItem - Demo Simple List 1`] = `
可用8000.34 -
+ diff --git a/components/codebox/test/__snapshots__/demo.spec.js.snap b/components/codebox/test/__snapshots__/demo.spec.js.snap index 898bd0328..551dc385a 100644 --- a/components/codebox/test/__snapshots__/demo.spec.js.snap +++ b/components/codebox/test/__snapshots__/demo.spec.js.snap @@ -104,6 +104,7 @@ exports[`Codebox System keyboard 1`] = `
  • 9
  • .
  • 0
  • +
  • @@ -145,6 +146,7 @@ exports[`Codebox Unlimited length 1`] = `
  • 9
  • .
  • 0
  • +
  • diff --git a/components/date-picker/demo/cases/demo3.vue b/components/date-picker/demo/cases/demo3.vue index 55483eb7a..4cfad9885 100644 --- a/components/date-picker/demo/cases/demo3.vue +++ b/components/date-picker/demo/cases/demo3.vue @@ -4,7 +4,7 @@ @@ -70,4 +70,4 @@ export default { }, }, } - \ No newline at end of file + diff --git a/components/field/item.vue b/components/field/item.vue index 18eccfdc4..cf4c5234b 100644 --- a/components/field/item.vue +++ b/components/field/item.vue @@ -22,7 +22,7 @@
    {{ addon }} - +
    @@ -161,7 +161,7 @@ export default { justify-content flex-end color field-item-addon-color font-size field-item-addon-font-size - .md-icon-arrow-right + .md-icon-arrow margin-right -6px color color-text-placeholder @@ -173,6 +173,7 @@ export default { &.is-solid .md-field-item-title width field-item-title-width + color #01080F &.is-disabled .md-field-item-control, .md-field-item-left, diff --git a/components/field/test/__snapshots__/demo.spec.js.snap b/components/field/test/__snapshots__/demo.spec.js.snap index 1cd8805ea..3d3d4ef1a 100644 --- a/components/field/test/__snapshots__/demo.spec.js.snap +++ b/components/field/test/__snapshots__/demo.spec.js.snap @@ -50,7 +50,7 @@ exports[`Field Basic 1`] = `
    -
    +
    @@ -58,7 +58,7 @@ exports[`Field Basic 1`] = `
    内容禁用状态
    -
    +
    diff --git a/components/icon/default-svg-list.js b/components/icon/default-svg-list.js index 76a40433d..70e5778ca 100644 --- a/components/icon/default-svg-list.js +++ b/components/icon/default-svg-list.js @@ -1,8 +1,12 @@ export default { spinner: '', + ring: + '', 'warn-color': - '', + '', 'success-color': - '', + '', + 'fail-color': + '', } diff --git a/components/icon/demo/cases/demo0.vue b/components/icon/demo/cases/demo0.vue index b5bccedb0..49c31d783 100644 --- a/components/icon/demo/cases/demo0.vue +++ b/components/icon/demo/cases/demo0.vue @@ -33,6 +33,7 @@ export default { 'rectangle', 'right', 'wrong', + 'arrow', 'arrow-left', 'arrow-right', 'arrow-up', diff --git a/components/icon/index.vue b/components/icon/index.vue index e3329516f..7ac0a5ec6 100644 --- a/components/icon/index.vue +++ b/components/icon/index.vue @@ -90,7 +90,7 @@ export default { &:before position relative z-index 2 - + &.icon-svg &.xss width icon-size-xxs @@ -109,16 +109,18 @@ export default { vertical-height(icon-size-lg) // name +.md-icon-arrow:before + content "\e68d" .md-icon-rectangle:before - content "\e900" + content "\e68e" .md-icon-invisible:before content "\e601" .md-icon-visible:before content "\e602" .md-icon-right:before - content "\e905" + content "\e68f" .md-icon-wrong:before - content "\e906" + content "\e604" .md-icon-info:before content "\e605" .md-icon-service:before @@ -126,23 +128,23 @@ export default { .md-icon-edit:before content "\e607" .md-icon-refresh:before - content "\e901" + content "\e692" .md-icon-question:before content "\e608" .md-icon-setting:before content "\e609" .md-icon-wait:before - content "\e902" + content "\e690" .md-icon-check:before - content "\e904" + content "\e60c" .md-icon-check-disabled:before - content "\e903" + content "\e636" .md-icon-checked:before, .md-icon-success:before - content "\e908" + content "\e60d" .md-icon-clear:before, .md-icon-fail:before content "\e60e" .md-icon-info-solid:before - content "\e907" + content "\e635" .md-icon-warn:before content "\e60b" .md-icon-security:before @@ -216,7 +218,7 @@ export default { .md-icon-arrow-down:before content "\e634" .md-icon-close:before - content "\e604" + content "\e68c" @font-face font-family Mand-Mobile-Icon diff --git a/components/icon/test/__snapshots__/demo.spec.js.snap b/components/icon/test/__snapshots__/demo.spec.js.snap index d819bf3fc..8084f684a 100644 --- a/components/icon/test/__snapshots__/demo.spec.js.snap +++ b/components/icon/test/__snapshots__/demo.spec.js.snap @@ -11,6 +11,9 @@ exports[`Icon - Demo Font icon 1`] = `

    wrong

    +
    +

    arrow

    +

    arrow-left

    diff --git a/components/icon/test/cases/demo0.vue b/components/icon/test/cases/demo0.vue index 8f7d6c9c4..44bc7f1fe 100644 --- a/components/icon/test/cases/demo0.vue +++ b/components/icon/test/cases/demo0.vue @@ -27,6 +27,7 @@ export default { 'rectangle', 'right', 'wrong', + 'arrow', 'arrow-left', 'arrow-right', 'arrow-up', diff --git a/components/input-item/test/__snapshots__/demo.spec.js.snap b/components/input-item/test/__snapshots__/demo.spec.js.snap index 868f783e4..ba6dddada 100644 --- a/components/input-item/test/__snapshots__/demo.spec.js.snap +++ b/components/input-item/test/__snapshots__/demo.spec.js.snap @@ -238,6 +238,7 @@ exports[`InputItem - Demo input with controls 1`] = `
  • 9
  • .
  • 0
  • +
  • diff --git a/components/notice-bar/index.vue b/components/notice-bar/index.vue index dd20af3bd..5eb0f222e 100644 --- a/components/notice-bar/index.vue +++ b/components/notice-bar/index.vue @@ -109,7 +109,7 @@ export default { }, rightIcon() { - return this.mode === 'link' ? 'arrow-right' : 'close' + return this.mode === 'link' ? 'arrow' : 'close' }, }, @@ -190,7 +190,7 @@ export default { align-items center .md-notice-bar-left - padding-right 12px + padding-right 16px .md-notice-bar-right padding-right 32px .md-notice-bar-empty @@ -200,6 +200,7 @@ export default { flex 1 margin auto width auto + margin-right 40px line-height 64px white-space nowrap overflow hidden diff --git a/components/notice-bar/test/__snapshots__/demo.spec.js.snap b/components/notice-bar/test/__snapshots__/demo.spec.js.snap index 5669f2baf..a7876b7e1 100644 --- a/components/notice-bar/test/__snapshots__/demo.spec.js.snap +++ b/components/notice-bar/test/__snapshots__/demo.spec.js.snap @@ -41,7 +41,7 @@ exports[`NoticeBar - Demo Multi-line display 1`] = ` 为了确保您的资金安全,请设置支付密码。为了确保您的资金安全,请设置支付密码。为了确保您的资金安全,请设置支付密码。 -
    +
    `; @@ -110,7 +110,7 @@ exports[`NoticeBar - Demo Theme 1`] = ` 福利来啦,7日免息券发放中! -
    +
    `; diff --git a/components/number-keyboard/board.vue b/components/number-keyboard/board.vue index 52df67fdb..b69f8140d 100644 --- a/components/number-keyboard/board.vue +++ b/components/number-keyboard/board.vue @@ -1,5 +1,8 @@