Merge pull request #3622 from owncloud/move-create-button

owncloud · Jun 24, 2020 · e5c1c71 · e5c1c71
2 parents da7fa7c + 3ca616c
commit e5c1c71
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/apps/files/src/components/FileList.vue b/apps/files/src/components/FileList.vue
@@ -10,7 +10,7 @@
         key="files-list-results-existence"
         gutter="small"
         flex
-        class="uk-padding-small"
+        class="uk-padding-small uk-padding-remove-top uk-padding-remove-bottom uk-margin-xsmall-bottom"
       >
         <div>
           <oc-checkbox

diff --git a/apps/files/src/components/FilesAppBar.vue b/apps/files/src/components/FilesAppBar.vue
@@ -10,7 +10,7 @@
       @progress="onFileProgress"
     />
     <oc-grid flex gutter="small">
-      <div class="uk-flex-1">
+      <div>
         <div class="uk-flex">
           <oc-breadcrumb
             v-if="showBreadcrumb"

diff --git a/changelog/unreleased/move-create-button b/changelog/unreleased/move-create-button
@@ -0,0 +1,5 @@
+Change: Move create new button
+
+We've moved the create new button in the files app bar to the left directly next to breadcrumbs.
+
+https://github.com/owncloud/phoenix/pull/3622
diff --git a/tests/acceptance/pageObjects/filesPage.js b/tests/acceptance/pageObjects/filesPage.js
@@ -255,10 +255,9 @@ module.exports = {
       return (
         this.waitForElementVisible('@dialog')
           .waitForAnimationToFinish()
-          // clicking file overwrite dialog overlay to remove file upload
-          // popup, as we upload the file directly using `setValue`. The overwrite
-          // dialog is too fast and does not give time to close the dropdown beforehand
-          .clickElementAt(this.elements.dialog.selector, 0, 0)
+          // clicking new resource dropdown to hide it, as we upload the file directly using `setValue`.
+          // The overwrite dialog is too fast and does not give time to close the dropdown beforehand
+          .clickElementAt(this.elements.newResourceDropdown.selector, 0, 0)
           .waitForElementNotVisible('@newFolderButton')
           .click('@dialogConfirmBtn')
           .waitForElementNotPresent('@dialog')
@@ -288,6 +287,9 @@ module.exports = {
     deleteSelectedButton: {
       selector: '#delete-selected-btn'
     },
+    newResourceDropdown: {
+      selector: '#new-file-menu-drop'
+    },
     newFolderButton: {
       selector: '#new-folder-btn'
     },