From 0162015c4c26913d2e277bf368534f8ae935708c Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Mon, 7 Nov 2016 10:47:51 +0800 Subject: [PATCH] Button: update text button style --- examples/docs/zh-cn/table.md | 7 ++++-- packages/theme-default/src/button.css | 33 +++++++++++++++++---------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/examples/docs/zh-cn/table.md b/examples/docs/zh-cn/table.md index 6192649ef..8aa3126b5 100644 --- a/examples/docs/zh-cn/table.md +++ b/examples/docs/zh-cn/table.md @@ -513,8 +513,11 @@ inline-template fixed="right" label="操作" - width="80"> - 编辑 + width="100"> + + 查看 + 编辑 + diff --git a/packages/theme-default/src/button.css b/packages/theme-default/src/button.css index 0fb24a53e..8901543a8 100644 --- a/packages/theme-default/src/button.css +++ b/packages/theme-default/src/button.css @@ -17,6 +17,9 @@ outline: none; margin: 0; @utils-user-select none; + & + .el-button { + margin-left: 10px; + } @mixin button-size var(--button-padding-vertical), var(--button-padding-horizontal), var(--button-font-size), var(--button-border-radius); @@ -71,6 +74,10 @@ border-color: var(--button-disabled-border); } + &.el-button--text { + background-color: transparent; + } + &.is-plain { &, &:hover { @@ -112,18 +119,6 @@ @m info { @mixin button-variant var(--button-info-color), var(--button-info-fill), var(--button-info-border); } - @m text { - border: none; - color: var(--color-primary); - background: transparent; - - &:hover { - color: tint(var(--color-primary), var(--button-hover-tint-percent)); - } - &:active { - color: shade(var(--color-primary), var(--button-active-shade-percent)); - } - } @m large { @mixin button-size var(--button-large-padding-vertical), var(--button-large-padding-horizontal), var(--button-large-font-size), var(--button-border-radius); } @@ -133,6 +128,20 @@ @m mini { @mixin button-size var(--button-mini-padding-vertical), var(--button-mini-padding-horizontal), var(--button-mini-font-size), var(--button-border-radius); } + @m text { + border: none; + color: var(--color-primary); + background: transparent; + padding-left: 0; + padding-right: 0; + + &:hover { + color: tint(var(--color-primary), var(--button-hover-tint-percent)); + } + &:active { + color: shade(var(--color-primary), var(--button-active-shade-percent)); + } + } } @b button-group {