提交 dd8d2210 编写于 作者: fxy060608's avatar fxy060608

Merge branch 'dev' of https://github.com/dcloudio/uni-app into nvue-dev

# Conflicts:
#	packages/uni-h5/dist/index.css
#	packages/uni-h5/dist/index.umd.min.js
...@@ -257,6 +257,7 @@ uni-input { ...@@ -257,6 +257,7 @@ uni-input {
line-height: 1.4em; line-height: 1.4em;
height: 1.4em; height: 1.4em;
min-height: 1.4em; min-height: 1.4em;
overflow: hidden;
} }
uni-input[hidden] { uni-input[hidden] {
...@@ -282,23 +283,26 @@ uni-input[hidden] { ...@@ -282,23 +283,26 @@ uni-input[hidden] {
} }
.uni-input-placeholder, .uni-input-placeholder,
.uni-input-input { .uni-input-input{
position: absolute;
width: 100%; width: 100%;
height: 100%;
left: 0;
top: 0;
} }
.uni-input-placeholder { .uni-input-placeholder {
position: absolute;
top: 50%;
left: 0;
transform: translateY(-50%);
color: gray; color: gray;
overflow: hidden; overflow: hidden;
text-overflow: clip; text-overflow: clip;
white-space: pre; white-space: pre;
word-break: keep-all; word-break: keep-all;
pointer-events: none;
} }
.uni-input-input { .uni-input-input {
display: block;
height: 100%;
background: none; background: none;
color: inherit; color: inherit;
opacity: inherit; opacity: inherit;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册