From 66b416c991bf1c946a145cffabde5ed382f5878b Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Wed, 18 Jan 2023 10:00:58 +0100 Subject: [PATCH 1/5] Squash spacelist on sidebar open --- .../src/components/Spaces/SpacesList.vue | 14 +++++++++++++- .../web-app-admin-settings/src/views/Spaces.vue | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue index 02e23bd30ea..9fb8b63c971 100644 --- a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue +++ b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue @@ -475,9 +475,21 @@ export default defineComponent({ .oc-table-data-cell-usedQuota { display: none; - @media only screen and (min-width: 1700px) { + @media only screen and (min-width: 1600px) { display: table-cell; } } + &-squashed { + .oc-table-header-cell-totalQuota, + .oc-table-data-cell-totalQuota, + .oc-table-header-cell-availableQuota, + .oc-table-data-cell-availableQuota, + .oc-table-header-cell-usedQuota, + .oc-table-data-cell-usedQuota, + .oc-table-header-cell-remainingQuota, + .oc-table-data-cell-remainingQuota { + display: none; + } + } } diff --git a/packages/web-app-admin-settings/src/views/Spaces.vue b/packages/web-app-admin-settings/src/views/Spaces.vue index 6aba7b57a60..cbee8963b02 100644 --- a/packages/web-app-admin-settings/src/views/Spaces.vue +++ b/packages/web-app-admin-settings/src/views/Spaces.vue @@ -45,6 +45,7 @@
Date: Wed, 18 Jan 2023 10:05:43 +0100 Subject: [PATCH 2/5] Add to changelog --- changelog/unreleased/enhancement-spaces-list-in-admin-settings | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog/unreleased/enhancement-spaces-list-in-admin-settings b/changelog/unreleased/enhancement-spaces-list-in-admin-settings index d2c5bfd9540..ab235f296b0 100644 --- a/changelog/unreleased/enhancement-spaces-list-in-admin-settings +++ b/changelog/unreleased/enhancement-spaces-list-in-admin-settings @@ -16,4 +16,5 @@ https://github.com/owncloud/web/pull/8238 https://github.com/owncloud/web/pull/8234 https://github.com/owncloud/web/pull/8249 https://github.com/owncloud/web/pull/8230 +https://github.com/owncloud/web/pull/8262 https://github.com/owncloud/web/issues/8219 From 86176303573d5b918df0a5a00bf20584a8cc17ff Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Wed, 18 Jan 2023 11:55:36 +0100 Subject: [PATCH 3/5] Remove availableQuota --- .../src/components/Spaces/SpacesList.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue index 9fb8b63c971..6b4b1f0edbf 100644 --- a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue +++ b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue @@ -469,8 +469,6 @@ export default defineComponent({ } .oc-table-header-cell-totalQuota, .oc-table-data-cell-totalQuota, - .oc-table-header-cell-availableQuota, - .oc-table-data-cell-availableQuota, .oc-table-header-cell-usedQuota, .oc-table-data-cell-usedQuota { display: none; @@ -482,8 +480,6 @@ export default defineComponent({ &-squashed { .oc-table-header-cell-totalQuota, .oc-table-data-cell-totalQuota, - .oc-table-header-cell-availableQuota, - .oc-table-data-cell-availableQuota, .oc-table-header-cell-usedQuota, .oc-table-data-cell-usedQuota, .oc-table-header-cell-remainingQuota, From 3d82988ae4d6364488b3d75638932c11893786e2 Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Wed, 18 Jan 2023 12:07:49 +0100 Subject: [PATCH 4/5] Hide more cells on squashed --- .../src/components/Spaces/SpacesList.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue index 6b4b1f0edbf..15c9148a28a 100644 --- a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue +++ b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue @@ -478,12 +478,16 @@ export default defineComponent({ } } &-squashed { + .oc-table-header-cell-manager, + .oc-table-data-cell-manager, .oc-table-header-cell-totalQuota, .oc-table-data-cell-totalQuota, .oc-table-header-cell-usedQuota, .oc-table-data-cell-usedQuota, .oc-table-header-cell-remainingQuota, - .oc-table-data-cell-remainingQuota { + .oc-table-data-cell-remainingQuota, + .oc-table-header-cell-mdate, + .oc-table-data-cell-mdate { display: none; } } From 6b07909e11ead9e81604d61d9aa9f541ad2bd299 Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Wed, 18 Jan 2023 12:27:30 +0100 Subject: [PATCH 5/5] Add squashed media query --- .../src/components/Spaces/SpacesList.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue index 15c9148a28a..cd825d06c26 100644 --- a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue +++ b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue @@ -483,12 +483,17 @@ export default defineComponent({ .oc-table-header-cell-totalQuota, .oc-table-data-cell-totalQuota, .oc-table-header-cell-usedQuota, - .oc-table-data-cell-usedQuota, + .oc-table-data-cell-usedQuota { + display: none; + } .oc-table-header-cell-remainingQuota, .oc-table-data-cell-remainingQuota, .oc-table-header-cell-mdate, .oc-table-data-cell-mdate { display: none; + @media only screen and (min-width: 1400px) { + display: table-cell; + } } } }