diff --git a/src/action-sheet/index.js b/src/action-sheet/index.js index dad69bd..3a9e5df 100644 --- a/src/action-sheet/index.js +++ b/src/action-sheet/index.js @@ -1,11 +1,11 @@ export default { - 'tiny-mobile-action-sheet-content-bgcolor': '#ddd', - 'tiny-mobile-action-sheet-menu-bgcolor': '#fff', - 'tiny-mobile-action-sheet-item-color': '#333', - 'tiny-mobile-action-sheet-item-warn-color': '#f36f64', - 'tiny-mobile-action-sheet-item-font-size': '16px', - 'tiny-mobile-action-sheet-item-border-color': '#ddd', - 'tiny-mobile-action-sheet-item-active-bgcolor': '#ececec', - 'tiny-mobile-action-sheet-item-active-color': '#039be5', - 'tiny-mobile-action-sheet-action-bgcolor': '#fff' -} + "tiny-mobile-action-sheet-content-bg-color": "#fff", + "tiny-mobile-action-sheet-menu-bg-color": "#fff", + "tiny-mobile-action-sheet-item-text-color": "#333", + "tiny-mobile-action-sheet-item-warn-text-color": "#f36f64", + "tiny-mobile-action-sheet-item-font-size": "12px", + "tiny-mobile-action-sheet-item-border-color": "#ddd", + "tiny-mobile-action-sheet-item-active-bg-color": "#ececec", + "tiny-mobile-action-sheet-item-active-text-color": "#039be5", + "tiny-mobile-action-sheet-action-bg-color": "#fff", +}; diff --git a/src/action-sheet/index.less b/src/action-sheet/index.less index 3e93d4b..c0f36d9 100644 --- a/src/action-sheet/index.less +++ b/src/action-sheet/index.less @@ -17,8 +17,9 @@ @action-sheet-prefix-cls: ~'@{css-prefix}mobile-action-sheet'; .@{action-sheet-prefix-cls} { + position: relative; + height: 100%; &__mask { - position: fixed; top: 0; right: 0; bottom: 0; @@ -28,23 +29,25 @@ } &__content { - position: fixed; bottom: 0; left: 0; width: 100%; - background-color: var(--ti-mobile-action-sheet-content-bgcolor, #ddd); + background-color: var(--ti-mobile-action-sheet-content-bg-color, #fff); transform: translate(0, 100%); backface-visibility: hidden; transition: transform 0.3s; - z-index: 5000; - + z-index: 500; + overflow: hidden; &.is-toggle { transform: translate(0, 0); } + &.is-not-content{ + z-index: 2000; + } } &__menu { - background-color: var(--ti-mobile-action-sheet-menu-bgcolor, #fff); + background-color: var(--ti-mobile-action-sheet-menu-bg-color, #fff); } &__menu.is-ellipsis &__item { @@ -58,19 +61,21 @@ &__item, &__cancel { position: relative; - padding: 10px 16px; - color: var(--ti-mobile-action-sheet-item-color, #333); + height: 40px; + line-height: 40px; + padding: 0px 16px; + color: var(--ti-mobile-action-sheet-item-text-color, #333); font-size: var(--ti-mobile-action-sheet-item-font-size, 16px); text-align: center; } &__item { &:active { - background-color: var(--ti-mobile-action-sheet-item-active-bgcolor, #ececec); + background-color: var(--ti-mobile-action-sheet-item-active-bg-color, #ececec); } &.is-active { - color: var(--ti-mobile-action-sheet-item-active-color, #039be5); + color: var(--ti-mobile-action-sheet-item-active-text-color, #039be5); } } @@ -78,13 +83,14 @@ .hairline('top', var(--ti-mobile-action-sheet-item-border-color, #ddd)); &.is-warn { - color: var(--ti-mobile-action-sheet-item-warn-color, #f36f64); + color: var(--ti-mobile-action-sheet-item-warn-text-color, #f36f64); } } &__action { - margin-top: 10px; - background-color: var(--ti-mobile-action-sheet-action-bgcolor, #fff); + width: 100%; + position: absolute; + background-color: var(--ti-mobile-action-sheet-action-bg-color, #fff); } } diff --git a/src/action-sheet/vars.less b/src/action-sheet/vars.less index f7f99a3..c4ad2c5 100644 --- a/src/action-sheet/vars.less +++ b/src/action-sheet/vars.less @@ -1,11 +1,11 @@ :root { - --ti-mobile-action-sheet-content-bgcolor: #ddd; - --ti-mobile-action-sheet-menu-bgcolor: var(--ti-mobile-base-color-light, #fff); - --ti-mobile-action-sheet-item-color: var(--ti-mobile-base-color-info-normal, #333); - --ti-mobile-action-sheet-item-warn-color: #f36f64; - --ti-mobile-action-sheet-item-font-size: 16px; + --ti-mobile-action-sheet-content-bg-color: #fff; + --ti-mobile-action-sheet-menu-bg-color: var(--ti-mobile-base-color-light, #fff); + --ti-mobile-action-sheet-item-text-color: var(--ti-mobile-base-color-info-normal, #333); + --ti-mobile-action-sheet-item-warn-text-color: #f36f64; + --ti-mobile-action-sheet-item-font-size: 12px; --ti-mobile-action-sheet-item-border-color: #ddd; - --ti-mobile-action-sheet-item-active-bgcolor: #ececec; - --ti-mobile-action-sheet-item-active-color: #039be5; - --ti-mobile-action-sheet-action-bgcolor: var(--ti-mobile-base-color-light, #fff); + --ti-mobile-action-sheet-item-active-bg-color: #ececec; + --ti-mobile-action-sheet-item-active-text-color: #039be5; + --ti-mobile-action-sheet-action-bg-color: var(--ti-mobile-base-color-light, #fff); } diff --git a/src/form-item/index.less b/src/form-item/index.less index 4e8b0f3..9e55c33 100644 --- a/src/form-item/index.less +++ b/src/form-item/index.less @@ -77,6 +77,14 @@ box-sizing: border-box; } + &__value { + float: right; + + .tiny-mobile-input-form__input{ + text-align: left; + } + } + &__content { line-height: 48px; position: relative; @@ -92,6 +100,21 @@ } } + &__label.is-ellipsis{ + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + display: initial; + } + + &.is-error .is-vertical{ + margin-bottom: 36px; + } + + .is-vertical { + border-bottom: 1px solid #ddd; + } + &__error { color: var(--ti-form-item-error-color, #f5222d); font-size: var(--ti-form-item-error-font-size, 12px); @@ -112,7 +135,7 @@ &.is-required:not(.is-no-asterisk) { .@{form-item-prefix-cls}__label-wrap > .@{form-item-prefix-cls}__label:before, - & > .@{form-item-prefix-cls}__label:before { + .@{form-item-prefix-cls}__label:before { content: '*'; color: var(--ti-form-item-error-color, #f5222d); margin-right: 4px; diff --git a/src/form/index.less b/src/form/index.less index 566d65c..54ddef6 100644 --- a/src/form/index.less +++ b/src/form/index.less @@ -32,19 +32,16 @@ .@{form-item-prefix-cls}__label { width: 35%; - height: 48px; + min-height: 48px; line-height: 1.4; font-size: 16px; display: flex; - align-items: center; - position: absolute; - left: 0; - top: 0; z-index: 1; + padding: 13px 0px; } - .@{form-item-prefix-cls}__content { - margin: 0 !important; + .@{form-item-prefix-cls}__value { + width: 65%; } &--inline { @@ -81,7 +78,10 @@ position: initial; text-align: left; line-height: 1; - padding: 0 0 8px; + } + + .@{form-item-prefix-cls}__value { + width: 100%; } .@{form-item-prefix-cls} { @@ -91,6 +91,11 @@ .@{input-form-prefix-cls}__input { width: 100%; } + + .@{form-item-prefix-cls}__content { + flex-wrap: wrap; + } + } &--label-top & { diff --git a/src/input/index.js b/src/input/index.js index 49257a9..371a6cf 100644 --- a/src/input/index.js +++ b/src/input/index.js @@ -1,22 +1,23 @@ export default { - 'tiny-mobile-input-bgcolor': '#fff', - 'tiny-mobile-input-height': '30px', - 'tiny-mobile-input-medium-height': '42px', - 'tiny-mobile-input-small-height': '36px', - 'tiny-mobile-input-mini-height': '24px', - 'tiny-mobile-input-disabled-color': '#999', - 'tiny-mobile-input-disabled-bgcolor': '#f5f5f5', - 'tiny-mobile-input-exceed-color': '#f5222d', - 'tiny-mobile-input-icon-font-size': '16px', - 'tiny-mobile-input-icon-close-color': '#bfbfbf', - 'tiny-mobile-textarea-count-color': '#999', - 'tiny-mobile-textarea-count-font-size': '12px', - 'tiny-mobile-textarea-inner-height': '96px', - 'tiny-mobile-textarea-inner-font-size': '16px', - 'tiny-mobile-textarea-inner-color': '#666', - 'tiny-mobile-textarea-inner-placeholder-color': '#ccc', - 'tiny-mobile-textarea-title-font-size': '16px', - 'tiny-mobile-textarea-title-color': '#333', - 'tiny-mobile-textarea-showlimit-inner-height': '70px', - 'tiny-mobile-textarea-showcontent-inner-height': '66px' -} + "tiny-mobile-input-bg-color": "#fff", + "tiny-mobile-input-line-height": "30px", + "tiny-mobile-input-medium-height": "42px", + "tiny-mobile-input-small-height": "36px", + "tiny-mobile-input-mini-height": "24px", + "tiny-mobile-input-color-disabled": "#999", + "tiny-mobile-input-bg-color-disabled": "#f5f5f5", + "tiny-mobile-input-exceed-text-color": "#f5222d", + "tiny-mobile-input-icon-font-size": "16px", + "tiny-mobile-input-icon-close-color": "#bfbfbf", + "tiny-mobile-textarea-count-text-color": "#999", + "tiny-mobile-textarea-count-font-size": "12px", + "tiny-mobile-textarea-inner-height": "96px", + "tiny-mobile-textarea-inner-font-size": "16px", + "tiny-mobile-textarea-inner-text-color": "#666", + "tiny-mobile-textarea-inner-placeholder-color": "#ccc", + "tiny-mobile-textarea-title-font-size": "16px", + "tiny-mobile-textarea-title-text-color": "#333", + "tiny-mobile-textarea-showlimit-inner-height": "70px", + "tiny-mobile-textarea-showcontent-inner-height": "66px", + "tiny-mobile-input-form-bg-color-error": "rgba(230, 34, 34, 0.04)", +}; diff --git a/src/input/index.less b/src/input/index.less index b34256e..d0ad705 100644 --- a/src/input/index.less +++ b/src/input/index.less @@ -24,11 +24,11 @@ position: relative; display: inline-block; width: 100%; - background-color: var(--ti-mobile-input-bgcolor, #fff); + background-color: var(--ti-mobile-input-bg-color, #fff); padding: 12px 16px; &__count { - color: var(--ti-mobile-textarea-count-color, #999); + color: var(--ti-mobile-textarea-count-text-color, #999); font-size: var(--ti-mobile-textarea-count-font-size, 12px); margin-top: 4px; text-align: right; @@ -39,7 +39,7 @@ width: 100%; height: var(--ti-mobile-textarea-inner-height, 96px); font-size: var(--ti-mobile-textarea-inner-font-size, 16px); - color: var(--ti-mobile-textarea-inner-color, #666); + color: var(--ti-mobile-textarea-inner-text-color, #666); padding: 0; border: 0; display: block; @@ -58,7 +58,7 @@ &__title { font-size: var(--ti-mobile-textarea-title-font-size, 16px); - color: var(--ti-mobile-textarea-title-color, #333); + color: var(--ti-mobile-textarea-title-text-color, #333); margin-bottom: 8px; } @@ -79,13 +79,13 @@ } &.is-disabled &__inner { - background-color: var(--ti-mobile-input-disabled-bgcolor, #f5f5f5); - color: var(--ti-mobile-input-disabled-color, #999); + background-color: var(--ti-mobile-input-bg-color-disabled, #f5f5f5); + color: var(--ti-mobile-input-color-disabled, #999); cursor: not-allowed; } &.is-exceed &__count { - color: var(--ti-mobile-input-exceed-color, #f5222d); + color: var(--ti-mobile-input-exceed-text-color, #f5222d); } } @@ -122,13 +122,13 @@ } &.is-exceed &__suffix &__count { - color: var(--ti-mobile-input-exceed-color, #f5222d); + color: var(--ti-mobile-input-exceed-text-color, #f5222d); } &.is-disabled &__inner { cursor: not-allowed; - color: var(--ti-mobile-input-disabled-color, #999); - background: var(--ti-mobile-input-disabled-bgcolor, #f5f5f5); + color: var(--ti-mobile-input-color-disabled, #999); + background: var(--ti-mobile-input-bg-color-disabled, #f5f5f5); } &.is-disabled &__icon { @@ -137,7 +137,7 @@ &.@{css-prefix}svg { &, &:hover { - fill: var(--ti-mobile-input-disabled-color, #999); + fill: var(--ti-mobile-input-color-disabled, #999); } } } @@ -147,7 +147,7 @@ .@{css-prefix}svg { &, &:hover { - fill: var(--ti-mobile-input-disabled-color, #999); + fill: var(--ti-mobile-input-color-disabled, #999); } } } @@ -159,7 +159,7 @@ &, &:hover { - fill: var(--ti-mobile-input-disabled-color, #999); + fill: var(--ti-mobile-input-color-disabled, #999); } } @@ -171,7 +171,7 @@ font-size: 12px; .@{input-prefix-cls}__count-inner { - background: var(--ti-mobile-input-bgcolor, #fff); + background: var(--ti-mobile-input-bg-color, #fff); line-height: initial; display: inline-block; } @@ -183,7 +183,7 @@ line-height: 48px; font-size: 16px; color: #666; - background: var(--ti-mobile-input-bgcolor, #fff); + background: var(--ti-mobile-input-bg-color, #fff); padding: 0 16px; border: 0; outline: 0; @@ -214,7 +214,7 @@ transition: all 0.3s; text-align: center; color: #d9d9d9; - line-height: calc(var(--ti-mobile-input-height, 30px) - 2px); + line-height: calc(var(--ti-mobile-input-line-height, 30px) - 2px); } &.is-active &__inner, @@ -244,14 +244,14 @@ &__icon { height: 100%; - line-height: var(--ti-mobile-input-height, 30px); + line-height: var(--ti-mobile-input-line-height, 30px); text-align: center; transition: all 0.3s; font-size: var(--ti-mobile-input-icon-font-size, 16px); &, &:hover { - fill: var(--ti-mobile-input-disabled-color, #999); + fill: var(--ti-mobile-input-color-disabled, #999); } &:after { @@ -348,25 +348,13 @@ line-height: 48px; position: relative; - &.isVertical:after { - content: ''; - display: block; - height: 0; - width: 100%; - border-bottom: 1px solid #ddd; - position: absolute; - left: 0; - bottom: 0; - z-index: 1; - } - &__select { display: flex; justify-content: flex-end; align-items: center; width: 100%; height: 100%; - background: var(--ti-mobile-input-bgcolor, #fff); + background: var(--ti-mobile-input-bg-color, #fff); } &__icon { @@ -398,26 +386,29 @@ } &__input { - width: 65%; float: right; } &__tips { width: 100%; - color: var(--ti-mobile-textarea-count-color, #999); + color: var(--ti-mobile-textarea-count-text-color, #999); padding-top: 6px; line-height: 20px; } &__error { - position: relative; + width: 100%; + height: 36px; + position: absolute; overflow: hidden; - font-size: 12px; - line-height: 1.416; - color: #f36f64; + font-size: 13px; + line-height: 36px; + color: var(--ti-mobile-common-color-error-text-1, #e62222); text-overflow: ellipsis; - padding: 0px 16px 0 16px; - + bottom: -36px; + background: var(--ti-mobile-input-form-bg-color-error, rgba(230, 34, 34, 0.04)); + border-radius: 4px; + padding: 0px 12px; &.align-right { text-align: right; } diff --git a/src/input/vars.less b/src/input/vars.less index e42e4a5..4da41f2 100644 --- a/src/input/vars.less +++ b/src/input/vars.less @@ -1,22 +1,23 @@ :root { - --ti-mobile-input-bgcolor: var(--ti-mobile-base-color-light, #fff); - --ti-mobile-input-height: var(--ti-mobile-base-size-height-minor, 30px); + --ti-mobile-input-bg-color: var(--ti-mobile-base-color-light, #fff); + --ti-mobile-input-line-height: var(--ti-mobile-base-size-height-minor, 30px); --ti-mobile-input-medium-height: var(--ti-mobile-base-size-height-medium, 42px); --ti-mobile-input-small-height: var(--ti-mobile-base-size-height-small, 36px); --ti-mobile-input-mini-height: var(--ti-mobile-base-size-height-mini, 24px); - --ti-mobile-input-disabled-color: var(--ti-mobile-base-color-placeholder, #999); - --ti-mobile-input-disabled-bgcolor: var(--ti-mobile-base-color-selected-background, #f5f5f5); - --ti-mobile-input-exceed-color: var(--ti-mobile-base-color-danger-normal, #f5222d); + --ti-mobile-input-color-disabled: var(--ti-mobile-base-color-placeholder, #999); + --ti-mobile-input-bg-color-disabled: var(--ti-mobile-base-color-selected-background, #f5f5f5); + --ti-mobile-input-exceed-text-color: var(--ti-mobile-base-color-danger-normal, #f5222d); --ti-mobile-input-icon-font-size: 16px; --ti-mobile-input-icon-close-color: var(--ti-mobile-base-color-primary-disabled, #bfbfbf); - --ti-mobile-textarea-count-color: var(--ti-mobile-base-color-placeholder, #999); + --ti-mobile-textarea-count-text-color: var(--ti-mobile-base-color-placeholder, #999); --ti-mobile-textarea-count-font-size: var(--ti-mobile-base-font-size, 12px); --ti-mobile-textarea-inner-height: 96px; --ti-mobile-textarea-inner-font-size: 16px; - --ti-mobile-textarea-inner-color: var(--ti-mobile-base-color-secondary, #666); + --ti-mobile-textarea-inner-text-color: var(--ti-mobile-base-color-secondary, #666); --ti-mobile-textarea-inner-placeholder-color: #ccc; --ti-mobile-textarea-title-font-size: 16px; - --ti-mobile-textarea-title-color: var(--ti-mobile-base-color-info-normal, #333); + --ti-mobile-textarea-title-text-color: var(--ti-mobile-base-color-info-normal, #333); --ti-mobile-textarea-showlimit-inner-height: 70px; --ti-mobile-textarea-showcontent-inner-height: 66px; + --ti-mobile-input-form-bg-color-error: rgba(230, 34, 34, 0.04); }