Skip to content

Commit 921e99f

Browse files
author
Guillaume Chau
committed
feat(ui): New StepWizard frame style
1 parent e20e21d commit 921e99f

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

packages/@vue/cli-ui/src/components/StatusBar.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,12 @@ export default {
112112
if (this.$route.name === 'project-select') {
113113
this.$router.push(lastRoute || { name: 'home' })
114114
} else {
115-
const { name, params, query } = this.$route
116-
lastRoute = { name, params, query }
115+
if (this.$route.name === 'project-create') {
116+
lastRoute = null
117+
} else {
118+
const { name, params, query } = this.$route
119+
lastRoute = { name, params, query }
120+
}
117121
this.$router.push({ name: 'project-select' })
118122
}
119123
},

packages/@vue/cli-ui/src/components/StepWizard.vue

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
>
88
<div class="shell">
99
<div class="header">
10-
<div v-if="title" class="title">{{ title }}</div>
10+
<div class="content">
11+
<div v-if="title" class="title">{{ title }}</div>
12+
</div>
1113
</div>
1214

1315
<VueTabs
@@ -65,10 +67,19 @@ export default {
6567
v-box()
6668
height 100%
6769
70+
.header
71+
.content
72+
margin 0 auto
73+
6874
.main-tabs
6975
height 100%
7076
flex auto 1 1
7177
78+
>>> .vue-tab
79+
margin 0 auto
80+
padding $padding-item $padding-item 0
81+
box-sizing border-box
82+
7283
.header,
7384
>>> .tabs
7485
background $vue-color-light-neutral
@@ -84,6 +95,7 @@ export default {
8495
>>> .vue-tab-content
8596
overflow-y hidden
8697
v-box()
98+
margin 0 auto
8799
88100
> .content
89101
flex 100% 1 1
@@ -107,10 +119,11 @@ export default {
107119
108120
&.frame
109121
margin 0 auto
110-
padding $padding-item
111-
max-width 1200px
122+
$max-width = 1200px
112123
.shell
113-
border solid 1px $vue-color-light-neutral
114-
border-radius $br
124+
background $color-light-background
125+
.header .content,
126+
>>> .vue-tab
127+
max-width $max-width
115128
116129
</style>

0 commit comments

Comments
 (0)