Skip to content

Commit

Permalink
update popover/tooltip docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Leopoldthecoder committed Sep 13, 2016
1 parent ae05740 commit ea3f87f
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 15 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
- 修复 Select 多选时选项变为空数组后 placeholder 不出现的问题
- 修复 TimePicker 时间选择可滚动

#### 非兼容性更新
- Select 组件样式的 `display` 属性默认值修改为 `block`

### 1.0.0-rc.3

*2016-09-09*
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/input.md
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@

| 参数 | 说明 | 类型 | 可选值 | 默认值 |
|------------- |---------------- |---------------- |---------------------- |-------- |
| type | 同原生的 input 的 type 属性,如果为textarea则显示为extarea | string |||
| type | 同原生的 input 的 type 属性,如果为 textarea 则显示为 textarea | string |||
| value | 绑定值 | string, number |||
| maxlength | 最大输入长度 | number |||
| minlength | 最小输入长度 | number |||
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/popover.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Popover 的属性与 Tooltip 很类似,它们都是基于`Vue-popper`开发的

### 嵌套信息

嵌套表格的例子:
可以在 Popover 中嵌套多种类型信息,以下为嵌套表格的例子。

:::demo 利用分发取代`content`属性
```html
Expand Down
7 changes: 7 additions & 0 deletions examples/docs/select.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@
};
</script>

<style>
.demo-select .el-select {
display: inline-block;
width: 240px;
}
</style>

## Select 选择器

当选项过多时,使用下拉菜单展示并选择内容。
Expand Down
6 changes: 3 additions & 3 deletions examples/docs/tooltip.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
</script>
## Tooltips 文字提示

### 基础用法
常用于展示鼠标 hover 时的提示信息。

Tooltip 组件常用于展示鼠标 hover 时的提示信息,在这里我们提供9种不同的展示方式。
### 基础用法

下面是完整的九个示例,可以通过该示例来理解,选择你要的效果
在这里我们提供 9 种不同方向的展示方式,可以通过以下完整示例来理解,选择你要的效果

:::demo 使用`content`属性来决定`hover`时的提示信息。由`placement`属性决定展示效果:`placement`属性值为:`方向-箭头方位`;四个方向:`top``left``right``bottom`;三种箭头方位:`start`, `end`,默认为空。如`top center``placement="top"``left top``placement="left-end"`

Expand Down
2 changes: 1 addition & 1 deletion packages/select/src/select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
selected: {},
isSelect: true,
inputLength: 20,
inputWidth: 180,
inputWidth: 0,
valueChangeBySelected: false,
cachedPlaceHolder: '',
optionsCount: 0,
Expand Down
9 changes: 1 addition & 8 deletions packages/theme-default/src/select.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@component-namespace el {

@b select {
display: inline-block;
display: block;
position: relative;

@when small {
Expand Down Expand Up @@ -47,9 +47,6 @@
}

& .el-input {
width: 180px;
display: inline-block;

& .el-input__icon {
color: #c0ccda;
font-size: 12px;
Expand Down Expand Up @@ -99,10 +96,6 @@
}

@when multiple {
& .el-input {
width: 220px;
}

& .el-select-dropdown__item.selected {
color: #20A0FF;
background-color: #fff;
Expand Down
3 changes: 2 additions & 1 deletion packages/theme-default/src/slider.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

@component-namespace el {
@b slider {
@utils-clearfix;
@e runway {
width: 100%;
height: 4px;
Expand All @@ -21,7 +22,7 @@

@e input {
float: right;
margin-top: -10px;
margin-top: 7px;

& .el-input {
width: 130px;
Expand Down

0 comments on commit ea3f87f

Please sign in to comment.