From dc0c8ae01138d6ddb0860adf5eabb743b4d947e8 Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Mon, 17 Apr 2023 10:39:20 +0200 Subject: [PATCH 1/5] Fix quicklink icon alignment --- .../unreleased/enhancement-fix-quicklink-icon-alignment | 5 +++++ .../src/components/SideBar/Shares/Links/DetailsAndEdit.vue | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 changelog/unreleased/enhancement-fix-quicklink-icon-alignment diff --git a/changelog/unreleased/enhancement-fix-quicklink-icon-alignment b/changelog/unreleased/enhancement-fix-quicklink-icon-alignment new file mode 100644 index 00000000000..50fbe8dce91 --- /dev/null +++ b/changelog/unreleased/enhancement-fix-quicklink-icon-alignment @@ -0,0 +1,5 @@ +Enhancement: Fix quicklink icon alignment + +We've fixed the alignment of the quicklink icons. + +https://github.com/owncloud/web/issues/8606 diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue index ccfb6e90f7c..1dddb0555ca 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue @@ -557,4 +557,9 @@ export default defineComponent({ justify-content: flex-start; } } + +.oc-files-public-link-expires { + margin-top: 1px; // to align with the other elements + margin-left: 4px; // to align with the other elements +} From 590cde4cd4187ed9d4237745e41b7f9d393b4340 Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Mon, 17 Apr 2023 10:40:19 +0200 Subject: [PATCH 2/5] Add PR to changelog --- changelog/unreleased/enhancement-fix-quicklink-icon-alignment | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog/unreleased/enhancement-fix-quicklink-icon-alignment b/changelog/unreleased/enhancement-fix-quicklink-icon-alignment index 50fbe8dce91..ddb817a6d25 100644 --- a/changelog/unreleased/enhancement-fix-quicklink-icon-alignment +++ b/changelog/unreleased/enhancement-fix-quicklink-icon-alignment @@ -2,4 +2,5 @@ Enhancement: Fix quicklink icon alignment We've fixed the alignment of the quicklink icons. +https://github.com/owncloud/web/pull/8822 https://github.com/owncloud/web/issues/8606 From defaaed1d3f503ff2eba802bb261041c4ec0afc2 Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Mon, 17 Apr 2023 12:55:42 +0200 Subject: [PATCH 3/5] Use oc var --- .../src/components/SideBar/Shares/Links/DetailsAndEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue index 1dddb0555ca..8a3623823b2 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue @@ -560,6 +560,6 @@ export default defineComponent({ .oc-files-public-link-expires { margin-top: 1px; // to align with the other elements - margin-left: 4px; // to align with the other elements + margin-left: var(--oc-space-xsmall); // to align with the other elements } From 284df5890d77b7140de252191f8e12eef9f6113a Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Wed, 19 Apr 2023 12:16:23 +0200 Subject: [PATCH 4/5] Adjust invite people list item calendar icon --- .../src/components/SideBar/Shares/Collaborators/ListItem.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue index 8acb911cd74..115a95bfe45 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue @@ -72,7 +72,7 @@ class="files-collaborators-collaborator-expiration" data-testid="recipient-info-expiration-date" :aria-label="expirationDate" - name="calendar" + name="calendar-event" fill-type="line" /> @@ -409,4 +409,7 @@ export default defineComponent({ margin-left: var(--oc-space-medium); } } +.files-collaborators-collaborator-expiration { + margin-top: 5px; +} From 1d5cf33b785e884ee3205b4f038c459fcd0f948c Mon Sep 17 00:00:00 2001 From: Paul Neubauer Date: Wed, 26 Apr 2023 09:27:05 +0200 Subject: [PATCH 5/5] Address PR issues --- .../src/components/SideBar/Shares/Links/DetailsAndEdit.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue index 8a3623823b2..d06bcae44fc 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue @@ -92,7 +92,7 @@