From 921e99f3058f86d36be86748fb281d78bd98bb7c Mon Sep 17 00:00:00 2001 From: Guillaume Chau Date: Sat, 10 Mar 2018 01:06:11 +0100 Subject: [PATCH] feat(ui): New StepWizard frame style --- .../@vue/cli-ui/src/components/StatusBar.vue | 8 +++++-- .../@vue/cli-ui/src/components/StepWizard.vue | 23 +++++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/packages/@vue/cli-ui/src/components/StatusBar.vue b/packages/@vue/cli-ui/src/components/StatusBar.vue index 6642c8f8b8..33926ead49 100644 --- a/packages/@vue/cli-ui/src/components/StatusBar.vue +++ b/packages/@vue/cli-ui/src/components/StatusBar.vue @@ -112,8 +112,12 @@ export default { if (this.$route.name === 'project-select') { this.$router.push(lastRoute || { name: 'home' }) } else { - const { name, params, query } = this.$route - lastRoute = { name, params, query } + if (this.$route.name === 'project-create') { + lastRoute = null + } else { + const { name, params, query } = this.$route + lastRoute = { name, params, query } + } this.$router.push({ name: 'project-select' }) } }, diff --git a/packages/@vue/cli-ui/src/components/StepWizard.vue b/packages/@vue/cli-ui/src/components/StepWizard.vue index ac5a5e27dd..df88fb809a 100644 --- a/packages/@vue/cli-ui/src/components/StepWizard.vue +++ b/packages/@vue/cli-ui/src/components/StepWizard.vue @@ -7,7 +7,9 @@ >
-
{{ title }}
+
+
{{ title }}
+
>> .vue-tab + margin 0 auto + padding $padding-item $padding-item 0 + box-sizing border-box + .header, >>> .tabs background $vue-color-light-neutral @@ -84,6 +95,7 @@ export default { >>> .vue-tab-content overflow-y hidden v-box() + margin 0 auto > .content flex 100% 1 1 @@ -107,10 +119,11 @@ export default { &.frame margin 0 auto - padding $padding-item - max-width 1200px + $max-width = 1200px .shell - border solid 1px $vue-color-light-neutral - border-radius $br + background $color-light-background + .header .content, + >>> .vue-tab + max-width $max-width