Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
ca6637d5
Commit
ca6637d5
authored
Nov 07, 2016
by
baiyaaaaa
Committed by
GitHub
Nov 07, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #866 from Leopoldthecoder/master
Button: update text button style
parents
9a3aa1b5
0162015c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
11 deletions
+23
-11
examples/docs/zh-cn/table.md
examples/docs/zh-cn/table.md
+5
-2
packages/theme-default/src/button.css
packages/theme-default/src/button.css
+18
-9
No files found.
examples/docs/zh-cn/table.md
View file @
ca6637d5
...
@@ -513,8 +513,11 @@
...
@@ -513,8 +513,11 @@
inline-template
inline-template
fixed=
"right"
fixed=
"right"
label=
"操作"
label=
"操作"
width=
"80"
>
width=
"100"
>
<el-button
type=
"text"
size=
"small"
>
编辑
</el-button>
<span>
<el-button
type=
"text"
size=
"small"
>
查看
</el-button>
<el-button
type=
"text"
size=
"small"
>
编辑
</el-button>
</span>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
</template>
</template>
...
...
packages/theme-default/src/button.css
View file @
ca6637d5
...
@@ -17,6 +17,9 @@
...
@@ -17,6 +17,9 @@
outline
:
none
;
outline
:
none
;
margin
:
0
;
margin
:
0
;
@utils-user-select
none;
@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
);
@mixin
button-size
var
(
--button-padding-vertical
),
var
(
--button-padding-horizontal
),
var
(
--button-font-size
),
var
(
--button-border-radius
);
...
@@ -71,6 +74,10 @@
...
@@ -71,6 +74,10 @@
border-color
:
var
(
--button-disabled-border
);
border-color
:
var
(
--button-disabled-border
);
}
}
&
.el-button--text
{
background-color
:
transparent
;
}
&
.is-plain
{
&
.is-plain
{
&,
&,
&:hover
{
&:hover
{
...
@@ -112,10 +119,21 @@
...
@@ -112,10 +119,21 @@
@m
info
{
@m
info
{
@mixin
button-variant
var
(
--button-info-color
),
var
(
--button-info-fill
),
var
(
--button-info-border
);
@mixin
button-variant
var
(
--button-info-color
),
var
(
--button-info-fill
),
var
(
--button-info-border
);
}
}
@m
large
{
@mixin
button-size
var
(
--button-large-padding-vertical
),
var
(
--button-large-padding-horizontal
),
var
(
--button-large-font-size
),
var
(
--button-border-radius
);
}
@m
small
{
@mixin
button-size
var
(
--button-small-padding-vertical
),
var
(
--button-small-padding-horizontal
),
var
(
--button-small-font-size
),
var
(
--button-border-radius
);
}
@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
{
@m
text
{
border
:
none
;
border
:
none
;
color
:
var
(
--color-primary
);
color
:
var
(
--color-primary
);
background
:
transparent
;
background
:
transparent
;
padding-left
:
0
;
padding-right
:
0
;
&:hover
{
&:hover
{
color
:
tint
(
var
(
--color-primary
),
var
(
--button-hover-tint-percent
));
color
:
tint
(
var
(
--color-primary
),
var
(
--button-hover-tint-percent
));
...
@@ -124,15 +142,6 @@
...
@@ -124,15 +142,6 @@
color
:
shade
(
var
(
--color-primary
),
var
(
--button-active-shade-percent
));
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
);
}
@m
small
{
@mixin
button-size
var
(
--button-small-padding-vertical
),
var
(
--button-small-padding-horizontal
),
var
(
--button-small-font-size
),
var
(
--button-border-radius
);
}
@m
mini
{
@mixin
button-size
var
(
--button-mini-padding-vertical
),
var
(
--button-mini-padding-horizontal
),
var
(
--button-mini-font-size
),
var
(
--button-border-radius
);
}
}
}
@b
button-group
{
@b
button-group
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment