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
86f8ff11
Commit
86f8ff11
authored
Jan 28, 2018
by
Leopoldthecoder
Committed by
杨奕
Jan 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Input: el-input styles should override el-textarea
parent
bbe6e62e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
52 deletions
+52
-52
examples/docs/en-US/upload.md
examples/docs/en-US/upload.md
+1
-1
examples/docs/es/upload.md
examples/docs/es/upload.md
+1
-1
examples/docs/zh-CN/upload.md
examples/docs/zh-CN/upload.md
+1
-1
packages/theme-chalk/src/input.scss
packages/theme-chalk/src/input.scss
+49
-49
No files found.
examples/docs/en-US/upload.md
View file @
86f8ff11
...
@@ -254,7 +254,7 @@ Use `list-type` to change the fileList style.
...
@@ -254,7 +254,7 @@ Use `list-type` to change the fileList style.
:on-remove=
"handleRemove"
>
:on-remove=
"handleRemove"
>
<i
class=
"el-icon-plus"
></i>
<i
class=
"el-icon-plus"
></i>
</el-upload>
</el-upload>
<el-dialog
:visible.sync=
"dialogVisible"
size=
"tiny"
>
<el-dialog
:visible.sync=
"dialogVisible"
>
<img
width=
"100%"
:src=
"dialogImageUrl"
alt=
""
>
<img
width=
"100%"
:src=
"dialogImageUrl"
alt=
""
>
</el-dialog>
</el-dialog>
<script>
<script>
...
...
examples/docs/es/upload.md
View file @
86f8ff11
...
@@ -247,7 +247,7 @@ Utilice la propiedad `list-type` para cambiar el estilo a un listado de archivos
...
@@ -247,7 +247,7 @@ Utilice la propiedad `list-type` para cambiar el estilo a un listado de archivos
:on-remove=
"handleRemove"
>
:on-remove=
"handleRemove"
>
<i
class=
"el-icon-plus"
></i>
<i
class=
"el-icon-plus"
></i>
</el-upload>
</el-upload>
<el-dialog
:visible.sync=
"dialogVisible"
size=
"tiny"
>
<el-dialog
:visible.sync=
"dialogVisible"
>
<img
width=
"100%"
:src=
"dialogImageUrl"
alt=
""
>
<img
width=
"100%"
:src=
"dialogImageUrl"
alt=
""
>
</el-dialog>
</el-dialog>
<script>
<script>
...
...
examples/docs/zh-CN/upload.md
View file @
86f8ff11
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
:on-remove=
"handleRemove"
>
:on-remove=
"handleRemove"
>
<i
class=
"el-icon-plus"
></i>
<i
class=
"el-icon-plus"
></i>
</el-upload>
</el-upload>
<el-dialog
:visible.sync=
"dialogVisible"
size=
"tiny"
>
<el-dialog
:visible.sync=
"dialogVisible"
>
<img
width=
"100%"
:src=
"dialogImageUrl"
alt=
""
>
<img
width=
"100%"
:src=
"dialogImageUrl"
alt=
""
>
</el-dialog>
</el-dialog>
<script>
<script>
...
...
packages/theme-chalk/src/input.scss
View file @
86f8ff11
@import
"mixins/mixins"
;
@import
"mixins/mixins"
;
@import
"common/var"
;
@import
"common/var"
;
@include
b
(
textarea
)
{
display
:
inline-block
;
width
:
100%
;
vertical-align
:
bottom
;
font-size
:
$--font-size-base
;
@include
e
(
inner
)
{
display
:
block
;
resize
:
vertical
;
padding
:
5px
15px
;
line-height
:
1
.5
;
box-sizing
:
border-box
;
width
:
100%
;
font-size
:
inherit
;
color
:
$--input-color
;
background-color
:
$--input-fill
;
background-image
:
none
;
border
:
$--input-border
;
border-radius
:
$--input-border-radius
;
transition
:
$--border-transition-base
;
&
:
:
placeholder
{
color
:
$--input-placeholder-color
;
}
&
:hover
{
border-color
:
$--input-hover-border
;
}
&
:focus
{
outline
:
none
;
border-color
:
$--input-focus-border
;
}
}
@include
when
(
disabled
)
{
.el-textarea__inner
{
background-color
:
$--input-disabled-fill
;
border-color
:
$--input-disabled-border
;
color
:
$--input-disabled-color
;
cursor
:
not
-
allowed
;
&
:
:
placeholder
{
color
:
$--input-disabled-placeholder-color
;
}
}
}
}
@include
b
(
input
)
{
@include
b
(
input
)
{
position
:
relative
;
position
:
relative
;
font-size
:
$--font-size-base
;
font-size
:
$--font-size-base
;
...
@@ -249,55 +298,6 @@
...
@@ -249,55 +298,6 @@
}
}
}
}
@include
b
(
textarea
)
{
display
:
inline-block
;
width
:
100%
;
vertical-align
:
bottom
;
font-size
:
$--font-size-base
;
@include
e
(
inner
)
{
display
:
block
;
resize
:
vertical
;
padding
:
5px
15px
;
line-height
:
1
.5
;
box-sizing
:
border-box
;
width
:
100%
;
font-size
:
inherit
;
color
:
$--input-color
;
background-color
:
$--input-fill
;
background-image
:
none
;
border
:
$--input-border
;
border-radius
:
$--input-border-radius
;
transition
:
$--border-transition-base
;
&
:
:
placeholder
{
color
:
$--input-placeholder-color
;
}
&
:hover
{
border-color
:
$--input-hover-border
;
}
&
:focus
{
outline
:
none
;
border-color
:
$--input-focus-border
;
}
}
@include
when
(
disabled
)
{
.el-textarea__inner
{
background-color
:
$--input-disabled-fill
;
border-color
:
$--input-disabled-border
;
color
:
$--input-disabled-color
;
cursor
:
not
-
allowed
;
&
:
:
placeholder
{
color
:
$--input-disabled-placeholder-color
;
}
}
}
}
/** disalbe default clear on IE */
/** disalbe default clear on IE */
.
el-input__inner
:
:-
ms-clear
{
.
el-input__inner
:
:-
ms-clear
{
display
:
none
;
display
:
none
;
...
...
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