Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: moves wizard's "Finish" button to the left of back and next (#7027) 

This was done to avoid clicking finish when clicking fast on next.
This commit is contained in:
Joffrey JAFFEUX 2019-02-19 13:32:01 +01:00 committed by GitHub
parent 8a4cd15e46
commit 0616837a5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/wizard/templates/components/wizard-step.hbs
View File

@ -32,6 +32,12 @@
<a href {{action "quit"}} class='action-link quit' tabindex="11">{{i18n "wizard.quit"}}</a>
{{/if}}
{{#if showFinishButton}}
<button class='wizard-btn finish' {{action "exitEarly"}} disabled={{saving}} tabindex="10">
{{i18n "wizard.finish"}}
</button>
{{/if}}
{{#if showBackButton}}
<a href {{action "backStep"}} class='action-link back' tabindex="11">{{i18n "wizard.back"}}</a>
{{/if}}
@ -43,12 +49,6 @@
</button>
{{/if}}
{{#if showFinishButton}}
<button class='wizard-btn finish' {{action "exitEarly"}} disabled={{saving}} tabindex="10">
{{i18n "wizard.finish"}}
</button>
{{/if}}
{{#if showDoneButton}}
<button class='wizard-btn done' {{action "quit"}} disabled={{saving}} tabindex="10">
{{i18n "wizard.done"}}

5
app/assets/stylesheets/wizard.scss
View File

@ -113,6 +113,7 @@ body.wizard {
}
.wizard-step-colors {
max-height: 465px;
margin-bottom: 20px;
overflow-y: auto;
.grid {
@ -171,7 +172,7 @@ body.wizard {
border: 1px solid #ccc;
.wizard-step-contents {
min-height: 510px;
height: 550px;
}
.wizard-column-contents {
@ -544,7 +545,7 @@ body.wizard {
max-height: none;
}
.wizard-step-contents {
min-height: auto !important;
height: auto !important;
}
.wizard-step-banner {
width: 100% !important;