diff --git a/changelog/unreleased/enhancement-consistend-dropdows b/changelog/unreleased/enhancement-consistend-dropdows new file mode 100644 index 00000000000..92c4cd4f0c8 --- /dev/null +++ b/changelog/unreleased/enhancement-consistend-dropdows @@ -0,0 +1,6 @@ +Enhancement: Consistent dropdown menus + +Made the main dropdown menus (new, upload, context, etc) constistent in size, hover effect and spacing/margins. + +https://github.com/owncloud/web/issues/6555 +https://github.com/owncloud/web/pull/6762 diff --git a/changelog/unreleased/enhancement-update-ods b/changelog/unreleased/enhancement-update-ods index 5dbf3b601c0..98017651f99 100644 --- a/changelog/unreleased/enhancement-update-ods +++ b/changelog/unreleased/enhancement-update-ods @@ -10,10 +10,11 @@ We updated the ownCloud Design System to version 13.1.0-rc.5. Please refer to th - Enhancement - Redesign OcGhostElement: https://github.com/owncloud/owncloud-design-system/pull/2049 - Enhancement - Export package members: https://github.com/owncloud/owncloud-design-system/pull/2048 - Enhancement - Make OcResource inline-flex: https://github.com/owncloud/owncloud-design-system/pull/2041 +- Enhancement - Hover in ocDrop menus: https://github.com/owncloud/owncloud-design-system/pull/2069 - Bugfix - Disabled textarea color contrast in darkmode: https://github.com/owncloud/owncloud-design-system/pull/2055 - Bugfix - OcTextInput: Fix event handlers in loops: https://github.com/owncloud/owncloud-design-system/pull/2054 https://github.com/owncloud/web/pull/6749 https://github.com/owncloud/web/pull/6750 https://github.com/owncloud/web/pull/6953 -https://github.com/owncloud/owncloud-design-system/releases/tag/v13.1.0-rc.5 +https://github.com/owncloud/owncloud-design-system/releases/tag/v13.1.0-rc.9 diff --git a/packages/web-app-files/src/components/ActionMenuItem.vue b/packages/web-app-files/src/components/ActionMenuItem.vue index c3960b9be83..c968de70a89 100644 --- a/packages/web-app-files/src/components/ActionMenuItem.vue +++ b/packages/web-app-files/src/components/ActionMenuItem.vue @@ -109,12 +109,5 @@ export default { diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue index 6a6df0f3909..b7cbf829bfe 100644 --- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue +++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue @@ -22,19 +22,26 @@ padding-size="small" > -
  • +
  • - + Folder
  • -
  • +
  • - + {{ newFileHandler.menuTitle($gettext) }}
  • @@ -42,13 +49,16 @@
  • - + %{name}
  • @@ -89,10 +99,10 @@ padding-size="small" > -
  • +
  • -
  • +
  • @@ -831,12 +841,24 @@ export default defineComponent({ .create-list-folder { border-bottom: 1px solid var(--oc-color-border); } - .create-list-file button { - margin: 2px 0; + .create-list-folder button { + margin-bottom: 8px; } + .create-list-file:nth-child(2) button { + margin-top: 6px; + } +} +#upload-list, +#new-file-menu-drop { + min-width: 250px; } + + diff --git a/packages/web-app-files/src/components/AppBar/Upload/ResourceUpload.vue b/packages/web-app-files/src/components/AppBar/Upload/ResourceUpload.vue index 7390d19c991..52577905802 100644 --- a/packages/web-app-files/src/components/AppBar/Upload/ResourceUpload.vue +++ b/packages/web-app-files/src/components/AppBar/Upload/ResourceUpload.vue @@ -1,7 +1,7 @@