diff --git a/src/number-keyboard/Key.js b/src/number-keyboard/Key.js index 571ee0485..513dd62d6 100644 --- a/src/number-keyboard/Key.js +++ b/src/number-keyboard/Key.js @@ -70,9 +70,8 @@ export default createComponent({ render() { return (
-
{this.genContent()} -
+
); }, diff --git a/src/number-keyboard/index.js b/src/number-keyboard/index.js index 759313499..d5baf896d 100644 --- a/src/number-keyboard/index.js +++ b/src/number-keyboard/index.js @@ -142,18 +142,13 @@ export default createComponent({ } return ( -
+
{titleLeft && {titleLeft}} - {title && {title}} + {title &&

{title}

} {showClose && ( - + )}
); diff --git a/src/number-keyboard/index.less b/src/number-keyboard/index.less index b3893eb25..5b330ee5c 100644 --- a/src/number-keyboard/index.less +++ b/src/number-keyboard/index.less @@ -15,7 +15,7 @@ border-radius: 20px 20px 0 0; } - &__title { + &__header { position: relative; box-sizing: content-box; height: @number-keyboard-title-height; @@ -24,6 +24,11 @@ font-size: @number-keyboard-title-font-size; line-height: @number-keyboard-title-height; text-align: center; + } + + &__title { + display: inline-block; + font-weight: normal; &-left { position: absolute; @@ -48,6 +53,8 @@ padding: @number-keyboard-close-padding; color: @number-keyboard-close-color; font-size: @number-keyboard-close-font-size; + background-color: transparent; + border: none; cursor: pointer; &:active { @@ -70,10 +77,13 @@ display: flex; align-items: center; justify-content: center; + width: 100%; height: @number-keyboard-key-height; + padding: 0; font-size: @number-keyboard-key-font-size; line-height: 1.5; background-color: @white; + border: none; border-radius: @border-radius-lg; cursor: pointer; diff --git a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap index 97340ad96..71c33f9c9 100644 --- a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap +++ b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap @@ -35,231 +35,111 @@ exports[`renders demo correctly 1`] = `
-
-
1
-
-
-
2
-
-
-
3
-
-
-
4
-
-
-
5
-
-
-
6
-
-
-
7
-
-
-
8
-
-
-
9
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
0
-
-
-
+
+
+
-
+
diff --git a/src/number-keyboard/test/__snapshots__/index.spec.js.snap b/src/number-keyboard/test/__snapshots__/index.spec.js.snap index e453326ef..912ecac3d 100644 --- a/src/number-keyboard/test/__snapshots__/index.spec.js.snap +++ b/src/number-keyboard/test/__snapshots__/index.spec.js.snap @@ -4,44 +4,20 @@ exports[`extra-key slot 1`] = ` @@ -51,46 +27,22 @@ exports[`focus on key 1`] = ` @@ -100,46 +52,22 @@ exports[`focus on key 2`] = ` @@ -149,46 +77,22 @@ exports[`move and blur key 1`] = ` @@ -198,46 +102,22 @@ exports[`move and blur key 2`] = ` @@ -247,46 +127,22 @@ exports[`move and blur key 3`] = ` @@ -294,49 +150,27 @@ exports[`move and blur key 3`] = ` exports[`render title 1`] = ` @@ -344,49 +178,25 @@ exports[`render title 1`] = ` exports[`title-left slot 1`] = ` diff --git a/src/password-input/test/__snapshots__/demo.spec.js.snap b/src/password-input/test/__snapshots__/demo.spec.js.snap index fc9201cb6..cc1a24920 100644 --- a/src/password-input/test/__snapshots__/demo.spec.js.snap +++ b/src/password-input/test/__snapshots__/demo.spec.js.snap @@ -19,46 +19,22 @@ exports[`renders demo correctly 1`] = `
-
-
1
-
-
-
2
-
-
-
3
-
-
-
4
-
-
-
5
-
-
-
6
-
-
-
7
-
-
-
8
-
-
-
9
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
0
-
-
-
+
+
+
-
+