diff --git a/src/styles/components/date-picker.less b/src/styles/components/date-picker.less
index e71a5da4..fa28d9c8 100644
--- a/src/styles/components/date-picker.less
+++ b/src/styles/components/date-picker.less
@@ -5,6 +5,7 @@
.@{date-picker-prefix-cls} {
position: relative;
+ line-height: normal;
.@{select-dropdown-prefix-cls} {
width: auto;
padding: 0;
diff --git a/src/styles/components/form.less b/src/styles/components/form.less
index f32095b1..f4bb9d7c 100644
--- a/src/styles/components/form.less
+++ b/src/styles/components/form.less
@@ -35,7 +35,7 @@
.clearfix();
&-content {
position: relative;
- //line-height: 32px;
+ line-height: 32px;
font-size: @font-size-small;
}
diff --git a/src/styles/components/select.less b/src/styles/components/select.less
index ba6b66ba..e0469808 100644
--- a/src/styles/components/select.less
+++ b/src/styles/components/select.less
@@ -10,6 +10,7 @@
color: @text-color;
font-size: @font-size-base;
position: relative;
+ line-height: normal;
&-selection {
display: block;
@@ -123,10 +124,11 @@
height: @input-height-base - 2px;
line-height: @input-height-base - 2px;
color: @input-placeholder-color;
+ font-size: @font-size-small;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- padding-left: 8px;
+ padding-left: 4px;
padding-right: 22px;
}
}
@@ -164,7 +166,7 @@
&-multiple &-input{
height: @input-height-base - 3px;
line-height: @input-height-base;
- padding: 0 0 0 6px;
+ padding: 0 0 0 4px;
}
&-not-found{
diff --git a/src/styles/components/slider.less b/src/styles/components/slider.less
index 53ec8208..4fa9e338 100644
--- a/src/styles/components/slider.less
+++ b/src/styles/components/slider.less
@@ -1,6 +1,7 @@
@slider-prefix-cls: ~"@{css-prefix}slider";
.@{slider-prefix-cls} {
+ line-height: normal;
&-wrap{
width: 100%;
height: @slider-height;
diff --git a/src/styles/mixins/checkbox.less b/src/styles/mixins/checkbox.less
index 913f1452..c72a07aa 100644
--- a/src/styles/mixins/checkbox.less
+++ b/src/styles/mixins/checkbox.less
@@ -146,9 +146,7 @@
cursor: pointer;
font-size: @font-size-small;
display: inline-block;
- & + & {
- margin-left: 8px;
- }
+ margin-right: 8px;
&-disabled{
cursor: @cursor-disabled;
}
diff --git a/src/styles/themes/default/custom.less b/src/styles/themes/default/custom.less
index 066481c7..ba7236e1 100644
--- a/src/styles/themes/default/custom.less
+++ b/src/styles/themes/default/custom.less
@@ -155,5 +155,5 @@
@slider-height : 4px;
@slider-margin : 16px 0;
@slider-button-wrap-size : 18px;
-@slider-button-wrap-offset : -5px;
+@slider-button-wrap-offset : -4px;
@slider-disabled-color : #ccc;
\ No newline at end of file
diff --git a/test/routers/form.vue b/test/routers/form.vue
index 696159b6..78d2fb28 100644
--- a/test/routers/form.vue
+++ b/test/routers/form.vue
@@ -48,12 +48,98 @@
Snapchat
+
+
+ Twitter
+
+
+
+ Facebook
+
+
+
+ Github
+
+
+
+ Snapchat
+
+
+
+ Twitter
+
+
+
+ Facebook
+
+
+
+ Github
+
+
+
+ Snapchat
+
+
+
+ Twitter
+
+
+
+ Facebook
+
+
+
+ Github
+
+
+
+ Snapchat
+
+
+
+ Twitter
+
+
+
+ Facebook
+
+
+
+ Github
+
+
+
+ Snapchat
+
+
+
+ Twitter
+
+
+
+ Facebook
+
+
+
+ Github
+
+
+
+ Snapchat
+
{{ item.label }}
+
+ {{ item.label }}
+
+
+ {{ item.label }}
+
@@ -64,12 +150,10 @@
- {{ form.date }}
- {{ form.date2 | json}}
-
+
提交