Commit 907d3218 authored by Leopoldthecoder's avatar Leopoldthecoder Committed by 杨奕

ColorPicker: fix style when nested in form-item

parent 7883b16b
...@@ -232,6 +232,7 @@ import { Notification } from 'element-ui'; ...@@ -232,6 +232,7 @@ import { Notification } from 'element-ui';
| customClass | 自定义类名 | string | — | — | | customClass | 自定义类名 | string | — | — |
| duration | 显示时间, 毫秒。设为 0 则不会自动关闭 | number | — | 4500 | | duration | 显示时间, 毫秒。设为 0 则不会自动关闭 | number | — | 4500 |
| onClose | 关闭时的回调函数 | function | — | — | | onClose | 关闭时的回调函数 | function | — | — |
| onClick | 点击 Notification 时的回调函数 | function | — | — |
| offset | 偏移的距离,在同一时刻,所有的 Notification 实例应当具有一个相同的偏移量 | number | — | 0 | | offset | 偏移的距离,在同一时刻,所有的 Notification 实例应当具有一个相同的偏移量 | number | — | 0 |
### 方法 ### 方法
......
...@@ -201,6 +201,7 @@ ...@@ -201,6 +201,7 @@
@component picker { @component picker {
display: inline-block; display: inline-block;
position: relative; position: relative;
line-height: normal;
@descendent trigger { @descendent trigger {
display: inline-block; display: inline-block;
...@@ -216,7 +217,6 @@ ...@@ -216,7 +217,6 @@
position: relative; position: relative;
display: inline-block; display: inline-block;
box-sizing: border-box; box-sizing: border-box;
vertical-align: middle;
border: 1px solid #666; border: 1px solid #666;
width: 22px; width: 22px;
height: 22px; height: 22px;
...@@ -238,14 +238,16 @@ ...@@ -238,14 +238,16 @@
@descendent empty { @descendent empty {
font-size: 12px; font-size: 12px;
vertical-align: middle; vertical-align: middle;
margin-top: 4px;
color: #666; color: #666;
position: absolute;
top: 4px;
left: 4px;
} }
@descendent icon { @descendent icon {
display: inline-block; display: inline-block;
position: relative; position: relative;
vertical-align: middle; top: -6px;
margin-left: 8px; margin-left: 8px;
width: 12px; width: 12px;
color: #888; color: #888;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment