From 812159a345d3f08ac51ec9bb99ce313fd574c003 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <alphadelta.fg@gmail.com>
Date: Fri, 31 Aug 2018 19:41:11 +0200
Subject: [PATCH] fix: put actions buttons together, closes #1588

---
 .../cli-ui/src/components/FileDiffView.vue    |  7 ++++++-
 .../cli-ui/src/components/FolderExplorer.vue  |  2 +-
 .../src/components/NpmPackageSearch.vue       | 20 +++++++++----------
 .../@vue/cli-ui/src/components/StepWizard.vue |  6 +++---
 .../src/views/ProjectConfigurationDetails.vue | 20 ++++++++++---------
 .../@vue/cli-ui/src/views/ProjectCreate.vue   |  8 +++-----
 .../cli-ui/src/views/ProjectDependencies.vue  |  2 +-
 .../cli-ui/src/views/ProjectPluginsAdd.vue    |  5 +----
 8 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/packages/@vue/cli-ui/src/components/FileDiffView.vue b/packages/@vue/cli-ui/src/components/FileDiffView.vue
index b16fa0a4e..75c56c26a 100644
--- a/packages/@vue/cli-ui/src/components/FileDiffView.vue
+++ b/packages/@vue/cli-ui/src/components/FileDiffView.vue
@@ -67,6 +67,7 @@
         />
         <VueButton
           :label="$t('org.vue.components.file-diff-view.actions.refresh')"
+          icon-left="refresh"
           class="big"
           @click="refresh()"
         />
@@ -100,7 +101,7 @@
         </VueFormField>
       </div>
 
-      <div slot="footer" class="actions space-between">
+      <div slot="footer" class="actions center">
         <VueButton
           :label="$t('org.vue.components.file-diff-view.modals.commit.actions.cancel')"
           class="flat"
@@ -273,4 +274,8 @@ export default {
     height 0
     overflow-x hidden
     overflow-y auto
+
+  .actions-bar
+    .vue-ui-button
+      min-width 190px
 </style>
diff --git a/packages/@vue/cli-ui/src/components/FolderExplorer.vue b/packages/@vue/cli-ui/src/components/FolderExplorer.vue
index 3c16c5da5..9635c89ce 100644
--- a/packages/@vue/cli-ui/src/components/FolderExplorer.vue
+++ b/packages/@vue/cli-ui/src/components/FolderExplorer.vue
@@ -176,7 +176,7 @@
         </VueFormField>
       </div>
 
-      <div slot="footer" class="actions space-between">
+      <div slot="footer" class="actions end">
         <VueButton
           :label="$t('org.vue.components.folder-explorer.new-folder.cancel')"
           class="flat close"
diff --git a/packages/@vue/cli-ui/src/components/NpmPackageSearch.vue b/packages/@vue/cli-ui/src/components/NpmPackageSearch.vue
index 2879d2062..7e451f21a 100644
--- a/packages/@vue/cli-ui/src/components/NpmPackageSearch.vue
+++ b/packages/@vue/cli-ui/src/components/NpmPackageSearch.vue
@@ -49,7 +49,13 @@
       </ais-index>
     </div>
 
-    <div class="actions-bar no-padding-x space-between">
+    <div class="actions-bar no-padding-x">
+      <div class="algolia">
+        <img class="ais-logo" src="~@/assets/search-by-algolia.svg">
+      </div>
+
+      <div class="vue-ui-spacer"/>
+
       <VueButton
         icon-left="close"
         :label="$t('org.vue.views.project-plugins-add.tabs.search.buttons.cancel')"
@@ -57,10 +63,6 @@
         @click="close()"
       />
 
-      <div class="algolia">
-        <img class="ais-logo" src="~@/assets/search-by-algolia.svg">
-      </div>
-
       <VueButton
         icon-left="file_download"
         :label="selectedIdModel ? $t('org.vue.views.project-plugins-add.tabs.search.buttons.install', { target: selectedIdModel }) : $t('org.vue.views.project-plugins-add.tabs.search.buttons.default-install')"
@@ -158,13 +160,9 @@ export default {
   overflow hidden
 
 .algolia
-  position absolute
-  margin 0 auto
-  top 0
-  left 0
-  width 100%
+  width 200px
   height 100%
-  pointer-events none
+  margin-left $padding-item
   h-box()
   box-center()
 </style>
diff --git a/packages/@vue/cli-ui/src/components/StepWizard.vue b/packages/@vue/cli-ui/src/components/StepWizard.vue
index b48f61857..b34eed5dc 100644
--- a/packages/@vue/cli-ui/src/components/StepWizard.vue
+++ b/packages/@vue/cli-ui/src/components/StepWizard.vue
@@ -106,9 +106,9 @@ export default {
       overflow-y auto
 
     > .actions-bar
-      justify-content space-between
-      &.center
-        justify-content center
+      justify-content center
+      .vue-ui-button:not(.icon-button)
+        min-width 190px
 
   .title
     padding $padding-item
diff --git a/packages/@vue/cli-ui/src/views/ProjectConfigurationDetails.vue b/packages/@vue/cli-ui/src/views/ProjectConfigurationDetails.vue
index 1327ad829..8cd33f1e8 100644
--- a/packages/@vue/cli-ui/src/views/ProjectConfigurationDetails.vue
+++ b/packages/@vue/cli-ui/src/views/ProjectConfigurationDetails.vue
@@ -28,15 +28,7 @@
       </div>
     </template>
 
-    <div class="actions-bar space-between">
-      <VueButton
-        :disabled="!hasPromptsChanged"
-        icon-left="cancel"
-        class="big"
-        :label="$t('org.vue.views.project-configuration-details.actions.cancel')"
-        @click="cancel()"
-      />
-
+    <div class="actions-bar">
       <VueButton
         v-if="configuration && configuration.link"
         icon-right="open_in_new"
@@ -46,6 +38,16 @@
         target="_blank"
       />
 
+      <div class="vue-ui-spacer"/>
+
+      <VueButton
+        :disabled="!hasPromptsChanged"
+        icon-left="cancel"
+        class="big"
+        :label="$t('org.vue.views.project-configuration-details.actions.cancel')"
+        @click="cancel()"
+      />
+
       <VueButton
         v-if="configuration && !hasPromptsChanged"
         icon-left="refresh"
diff --git a/packages/@vue/cli-ui/src/views/ProjectCreate.vue b/packages/@vue/cli-ui/src/views/ProjectCreate.vue
index 568a60054..902c2b2ec 100644
--- a/packages/@vue/cli-ui/src/views/ProjectCreate.vue
+++ b/packages/@vue/cli-ui/src/views/ProjectCreate.vue
@@ -357,7 +357,7 @@
         </VueFormField>
       </div>
 
-      <div slot="footer" class="actions space-between">
+      <div slot="footer" class="actions end">
         <VueButton
           :label="$t('org.vue.views.project-create.tabs.presets.remote.cancel')"
           class="flat"
@@ -385,7 +385,7 @@
         {{ $t('org.vue.views.project-create.tabs.details.modal.body') }}
       </div>
 
-      <div slot="footer" class="actions space-between">
+      <div slot="footer" class="actions end">
         <VueButton
           :label="$t('org.vue.views.project-create.tabs.details.modal.buttons.back')"
           class="flat"
@@ -427,11 +427,9 @@
           @click="showSavePreset = false"
         />
 
-        <div class="vue-ui-spacer"/>
-
         <VueButton
           :label="$t('org.vue.views.project-create.tabs.configuration.modal.buttons.continue')"
-          class="flat continue"
+          class="continue"
           @click="createWithoutSaving()"
         />
 
diff --git a/packages/@vue/cli-ui/src/views/ProjectDependencies.vue b/packages/@vue/cli-ui/src/views/ProjectDependencies.vue
index 8f19108b5..c2ec382b0 100644
--- a/packages/@vue/cli-ui/src/views/ProjectDependencies.vue
+++ b/packages/@vue/cli-ui/src/views/ProjectDependencies.vue
@@ -116,7 +116,7 @@
         {{ $t('org.vue.views.project-dependencies.uninstall.body', { id: selectedId }) }}
       </div>
 
-      <div slot="footer" class="actions space-between">
+      <div slot="footer" class="actions end">
         <VueButton
           :label="$t('org.vue.views.project-dependencies.uninstall.cancel')"
           class="flat"
diff --git a/packages/@vue/cli-ui/src/views/ProjectPluginsAdd.vue b/packages/@vue/cli-ui/src/views/ProjectPluginsAdd.vue
index b6029bcb6..af2de30be 100644
--- a/packages/@vue/cli-ui/src/views/ProjectPluginsAdd.vue
+++ b/packages/@vue/cli-ui/src/views/ProjectPluginsAdd.vue
@@ -80,18 +80,15 @@
         {{ $t('org.vue.views.project-plugins-add.modal.body', { target: pluginId }) }}
       </div>
 
-      <div slot="footer" class="actions space-between">
+      <div slot="footer" class="actions end">
         <VueButton
           :label="$t('org.vue.views.project-plugins-add.modal.buttons.back')"
           class="flat"
           @click="showCancelInstall = false"
         />
 
-        <div class="vue-ui-spacer"/>
-
         <VueButton
           :label="$t('org.vue.views.project-plugins-add.modal.buttons.cancel')"
-          class="flat"
           @click="cancelInstall()"
         />