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
08b80ca4
Commit
08b80ca4
authored
Nov 02, 2017
by
Leopoldthecoder
Committed by
杨奕
Nov 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Steps: fix style for last step when vertical
parent
88868eeb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
10 deletions
+17
-10
examples/components/side-nav.vue
examples/components/side-nav.vue
+5
-6
examples/versions.json
examples/versions.json
+1
-1
packages/steps/src/step.vue
packages/steps/src/step.vue
+10
-2
packages/theme-chalk/src/common/var.scss
packages/theme-chalk/src/common/var.scss
+1
-1
No files found.
examples/components/side-nav.vue
View file @
08b80ca4
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
width
:
100%
;
width
:
100%
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
padding-right
:
30px
;
padding-right
:
30px
;
transition
:
opacity
.
5
s
;
transition
:
opacity
.
3
s
;
&
:hover
{
&
.is-fade
{
opacity
:
1
!important
;
transition
:
opacity
3s
;
}
}
li
{
li
{
...
@@ -88,6 +88,7 @@
...
@@ -88,6 +88,7 @@
<div
<div
class=
"side-nav"
class=
"side-nav"
@
mouseenter=
"isFade = false"
@
mouseenter=
"isFade = false"
:class=
"
{ 'is-fade': isFade }"
:style="navStyle">
:style="navStyle">
<ul>
<ul>
<li
class=
"nav-item"
v-for=
"item in data"
>
<li
class=
"nav-item"
v-for=
"item in data"
>
...
@@ -167,9 +168,7 @@
...
@@ -167,9 +168,7 @@
if
(
this
.
isSmallScreen
)
{
if
(
this
.
isSmallScreen
)
{
style
.
paddingBottom
=
'
60px
'
;
style
.
paddingBottom
=
'
60px
'
;
}
}
if
(
this
.
isFade
)
{
style
.
opacity
=
this
.
isFade
?
'
0.5
'
:
'
1
'
;
style
.
opacity
=
'
0.5
'
;
}
return
style
;
return
style
;
},
},
langConfig
()
{
langConfig
()
{
...
...
examples/versions.json
View file @
08b80ca4
{
"1.0.9"
:
"1.0"
,
"1.1.6"
:
"1.1"
,
"1.2.9"
:
"1.2"
,
"1.3.7"
:
"1.3"
,
"1.4.8"
:
"1.4"
,
"2.0.2"
:
"2.0"
}
{
"1.0.9"
:
"1.0"
,
"1.1.6"
:
"1.1"
,
"1.2.9"
:
"1.2"
,
"1.3.7"
:
"1.3"
,
"1.4.9"
:
"1.4"
,
"2.0.2"
:
"2.0"
}
\ No newline at end of file
\ No newline at end of file
packages/steps/src/step.vue
View file @
08b80ca4
<
template
>
<
template
>
<div
<div
class=
"el-step"
class=
"el-step"
:style=
"
[style, isLast ?
{ maxWidth: 100 / stepsCount + '%' } : { marginRight: - $parent.stepOffset + 'px' }]
"
:style=
"
style
"
:class=
"[
:class=
"[
!isSimple && `is-$
{$parent.direction}`,
!isSimple && `is-$
{$parent.direction}`,
isSimple
&&
'is-simple',
isSimple
&&
'is-simple',
...
@@ -113,6 +113,7 @@ export default {
...
@@ -113,6 +113,7 @@ export default {
return
isSimple
?
''
:
space
;
return
isSimple
?
''
:
space
;
},
},
style
:
function
()
{
style
:
function
()
{
const
style
=
{};
const
parent
=
this
.
$parent
;
const
parent
=
this
.
$parent
;
const
len
=
parent
.
steps
.
length
;
const
len
=
parent
.
steps
.
length
;
...
@@ -121,8 +122,15 @@ export default {
...
@@ -121,8 +122,15 @@ export default {
:
this
.
space
:
this
.
space
?
this
.
space
?
this
.
space
:
100
/
(
len
-
1
)
+
'
%
'
);
:
100
/
(
len
-
1
)
+
'
%
'
);
style
.
flexBasis
=
space
;
if
(
this
.
isVertical
)
return
style
;
if
(
this
.
isLast
)
{
style
.
maxWidth
=
100
/
this
.
stepsCount
+
'
%
'
;
}
else
{
style
.
marginRight
=
-
this
.
$parent
.
stepOffset
+
'
px
'
;
}
return
{
flexBasis
:
space
}
;
return
style
;
}
}
},
},
...
...
packages/theme-chalk/src/common/var.scss
View file @
08b80ca4
...
@@ -689,7 +689,7 @@ $--breakpoints: (
...
@@ -689,7 +689,7 @@ $--breakpoints: (
$--breakpoints-spec
:
(
$--breakpoints-spec
:
(
'xs-only'
:
(
max-width
:
$--sm
-
1
)
,
'xs-only'
:
(
max-width
:
$--sm
-
1
)
,
'sm
all
-and-up'
:
(
min-width
:
$--sm
)
,
'sm-and-up'
:
(
min-width
:
$--sm
)
,
'sm-only'
:
"(min-width:
#{
$--sm
}
) and (max-width:
#{
$--md
}
- 1)"
,
'sm-only'
:
"(min-width:
#{
$--sm
}
) and (max-width:
#{
$--md
}
- 1)"
,
'sm-and-down'
:
(
max-width
:
$--md
-
1
)
,
'sm-and-down'
:
(
max-width
:
$--md
-
1
)
,
'md-and-up'
:
(
min-width
:
$--md
)
,
'md-and-up'
:
(
min-width
:
$--md
)
,
...
...
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