Merge branch 'develop' into 'test'

修改级联组件样式 See merge request !165

Merge branch 'develop' into 'test'
be95cffb · 姜雷 · c0195888 · 9bed437e · be95cffb
Commit be95cffb authored Jun 21, 2019 by 姜雷
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

element-ui.scss src/assets/styles/element-ui.scss +3 -0

No files found.
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -101,6 +101,9 @@ $--color-danger: #ff3333;
    line-height: 1;
    font-size: 14px;
  }
+  .el-cascader__label {
+    line-height: 40px;
+  }
  .el-button {
    font-size: 14px;
    padding: 12px 20px;