From 711e93d2428cd390b510ee9636e92da98692b95c Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Mon, 7 Mar 2022 09:53:07 +0100 Subject: [PATCH 1/4] Added tag to left sidebar remove padding Adjust tag height Add changelog item lowercase beta tag Change bg color for tag Update snapshots Adjustments according to PR review Update changelog/unreleased/enhancement-sidebar-nav-tags Co-authored-by: Jannik Stehle <50302941+JammingBen@users.noreply.github.com> Fix linter Use the new size property of oc-tag --- .../unreleased/enhancement-sidebar-nav-tags | 6 ++++++ packages/web-app-files/src/index.js | 1 + .../src/components/SidebarNav/SidebarNav.vue | 1 + .../components/SidebarNav/SidebarNavItem.vue | 18 +++++++++++++++--- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 changelog/unreleased/enhancement-sidebar-nav-tags diff --git a/changelog/unreleased/enhancement-sidebar-nav-tags b/changelog/unreleased/enhancement-sidebar-nav-tags new file mode 100644 index 00000000000..8d9aad02cdc --- /dev/null +++ b/changelog/unreleased/enhancement-sidebar-nav-tags @@ -0,0 +1,6 @@ +Enhancement: Side bar nav tags + +We have implemented a way to show a tag next to the sidebar navigation item link text + +https://github.com/owncloud/web/pull/6540 +https://github.com/owncloud/web/issues/6259 diff --git a/packages/web-app-files/src/index.js b/packages/web-app-files/src/index.js index 50147d160ff..97a0abee8b4 100644 --- a/packages/web-app-files/src/index.js +++ b/packages/web-app-files/src/index.js @@ -66,6 +66,7 @@ const navItems = [ { name: $gettext('Spaces'), icon: 'layout-grid', + tag: $gettext('beta'), route: { path: `/${appInfo.id}/spaces/projects` }, diff --git a/packages/web-runtime/src/components/SidebarNav/SidebarNav.vue b/packages/web-runtime/src/components/SidebarNav/SidebarNav.vue index 0edda20154c..03cb01e768c 100644 --- a/packages/web-runtime/src/components/SidebarNav/SidebarNav.vue +++ b/packages/web-runtime/src/components/SidebarNav/SidebarNav.vue @@ -27,6 +27,7 @@ :fill-type="link.fillType" :name="link.name" :collapsed="navigation.closed" + :tag="link.tag" /> diff --git a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue index 58805d09f9e..425c5c38f95 100644 --- a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue +++ b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue @@ -10,8 +10,11 @@ :data-nav-id="index" :data-nav-name="navName" > - - + + + + + {{ tag }} @@ -56,6 +59,11 @@ export default { type: Boolean, required: false, default: false + }, + tag: { + type: String, + required: false, + default: null } }, computed: { @@ -83,12 +91,16 @@ export default { position: relative; align-items: center !important; display: flex !important; - justify-content: flex-start !important; + justify-content: space-between !important; padding: var(--oc-space-small) !important; border-radius: 5px; white-space: nowrap; user-select: none; + .oc-tag { + color: var(--oc-color-text-default); + background-color: var(--oc-color-background-highlight); + } .text { opacity: 1; transition: all 0s; From 13ef61142920d79871ddb2e582b9f0b211243e38 Mon Sep 17 00:00:00 2001 From: JanAckermann Date: Tue, 8 Mar 2022 10:51:25 +0100 Subject: [PATCH 2/4] Bump ods Update snapshots Add ODS bump changelog item Fix sidebarnav acceptance test selectors Lint fix Rebase, fix snapshots && test warnings Fix snapshots after rebase --- changelog/unreleased/enhancement-update-ods | 11 +++++ .../SharesNavigation.spec.js.snap | 14 +++--- .../RecipientContainer.spec.js.snap | 12 ++--- .../__snapshots__/FileShares.spec.js.snap | 2 +- .../__snapshots__/RoleDropdown.spec.js.snap | 48 +++++++++---------- .../__snapshots__/PublicLink.spec.js.snap | 4 +- .../views/__snapshots__/Trashbin.spec.js.snap | 29 +++++------ .../SharedWithOthers.spec.js.snap | 12 ++--- .../tests/unit/views/spaces/Project.spec.js | 8 +++- .../tests/unit/views/spaces/Projects.spec.js | 3 ++ .../spaces/__snapshots__/Project.spec.js.snap | 12 ++--- .../__snapshots__/Projects.spec.js.snap | 8 ++-- packages/web-runtime/package.json | 2 +- .../__snapshots__/SidebarNav.spec.js.snap | 6 +-- .../__snapshots__/SidebarNavItem.spec.js.snap | 6 ++- .../__snapshots__/ThemeSwitcher.spec.js.snap | 12 ++--- .../__snapshots__/UserMenu.spec.js.snap | 48 +++++++++---------- tests/acceptance/pageObjects/webPage.js | 3 +- yarn.lock | 10 ++-- 19 files changed, 135 insertions(+), 115 deletions(-) create mode 100644 changelog/unreleased/enhancement-update-ods diff --git a/changelog/unreleased/enhancement-update-ods b/changelog/unreleased/enhancement-update-ods new file mode 100644 index 00000000000..6bece8ae209 --- /dev/null +++ b/changelog/unreleased/enhancement-update-ods @@ -0,0 +1,11 @@ +Enhancement: Update ODS to v13.0.0-rc.1 + +We updated the ownCloud Design System to version 13.0.0-rc.1. Please refer to the full changelog in the ODS release (linked) for more details. Summary: + +- Change - Default type of OcButton: https//github.com/owncloud/owncloud-design-system/pull/2009 +- Enhancement - Apply size property to oc-card: https//github.com/owncloud/owncloud-design-system/pull/2011 +- Bugfix - Disabled OcSelect background: https//github.com/owncloud/owncloud-design-system/pull/2008 +- Bugfix - Icons/Thumbnails were only visible for clickable resources: https//github.com/owncloud/owncloud-design-system/pull/2007 + +https://github.com/owncloud/web/pull/6540 +https://github.com/owncloud/owncloud-design-system/releases/tag/v13.0.0-rc.1 diff --git a/packages/web-app-files/tests/unit/components/AppBar/__snapshots__/SharesNavigation.spec.js.snap b/packages/web-app-files/tests/unit/components/AppBar/__snapshots__/SharesNavigation.spec.js.snap index 80286bdeda1..4b9f85aa818 100644 --- a/packages/web-app-files/tests/unit/components/AppBar/__snapshots__/SharesNavigation.spec.js.snap +++ b/packages/web-app-files/tests/unit/components/AppBar/__snapshots__/SharesNavigation.spec.js.snap @@ -4,28 +4,28 @@ exports[`SharesNavigation component renders a shares navigation for both mobile