Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] Redesign Breadcrumb #6472

Merged
merged 2 commits into from
Feb 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog/unreleased/enhancement-redesign-breadcrumb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Redesign OcBreadcrumb

We've adjustet the look of the OcBreadcrumb
to fit the Redesign

https://github.com/owncloud/web/issues/6218
https://github.com/owncloud/web/pull/6472
11 changes: 11 additions & 0 deletions changelog/unreleased/enhancement-update-ods
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Enhancement: Update ODS to v12.2.0

We updated the ownCloud Design System to version 12.2.0. Please refer to the full changelog in the ODS release (linked) for more details. Summary:

- Enhancement - Apply outstanding background color to oc-card: https://github.com/owncloud/owncloud-design-system/pull/1974
- Enhancement - Redesign OcBreadcrumb: https://github.com/owncloud/web/issues/6218
- Enhancement - Redesign files table related components: https://github.com/owncloud/owncloud-design-system/pull/1958

https://github.com/owncloud/web/pull/6450
https://github.com/owncloud/web/pull/6472
https://github.com/owncloud/owncloud-design-system/releases/tag/v12.2.0
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@cucumber/messages": "^17.1.1",
"@cucumber/pretty-formatter": "^1.0.0-alpha.1",
"@noble/hashes": "^1.0.0",
"@playwright/test": "^1.17.2",
"@playwright/test": "^1.19.2",
"@rollup/plugin-alias": "^3.1.9",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-html": "^0.2.4",
Expand All @@ -66,7 +66,7 @@
"@types/node-fetch": "^2.6.0",
"@typescript-eslint/eslint-plugin": "^5.11.0",
"@typescript-eslint/parser": "^5.11.0",
"@vue/test-utils": "^1.2.2",
"@vue/test-utils": "^1.3.0",
"autoprefixer": "^10.4.2",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^27.0.6",
Expand All @@ -79,7 +79,7 @@
"eslint-config-prettier": "^6.10.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jest": "^24.1.3",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-promise": "^5.2.0",
Expand All @@ -98,7 +98,7 @@
"node-fetch": "^2.6.7",
"pino": "^7.6.3",
"pino-pretty": "^7.3.0",
"playwright": "^1.17.1",
"playwright": "^1.19.2",
"postcss": "^8.3.6",
"prettier": "^2.3.2",
"react": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"lodash-es": "^4.17.21",
"luxon": "^2.3.0",
"oidc-client": "1.11.5",
"owncloud-design-system": "12.1.1-rc1",
"owncloud-design-system": "12.2.0",
"owncloud-sdk": "~2.0.0",
"p-queue": "^6.1.1",
"popper-max-size-modifier": "^0.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/web-runtime/themes/owncloud/theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"swatch-warning-default": "",
"swatch-warning-hover": "",
"swatch-warning-muted": "",
"text-default": "#dadcdf",
"text-default": "#ffffff",
"text-inverse": "#000000",
"text-muted": "#696969",
"icon-folder": "rgb(44, 101, 255)",
Expand Down Expand Up @@ -159,4 +159,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion tests/acceptance/pageObjects/personalPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ module.exports = {
},
resourceBreadcrumb: {
selector:
'//nav[@id="files-breadcrumb"]//*[(self::a or self::button) and contains(text(),%s)]',
'//nav[@id="files-breadcrumb"]//*[(self::a or self::button)]/span[contains(text(),%s)]',
locateStrategy: 'xpath'
},
resourceBreadcrumbNonClickable: {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/support/page/files/allFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export class AllFilesPage {

await page.locator(`//*[@data-test-resource-name="${resourceBase}"]`).click({ button: 'right' })
await page.locator(`.oc-files-actions-${action}-trigger`).first().click()
await page.locator('//ol[@class="oc-breadcrumb-list"]/li/*[1]').first().click()
await page.locator('//nav[contains(@class, "oc-breadcrumb")]/ol/li[1]/a').click()
pascalwengerter marked this conversation as resolved.
Show resolved Hide resolved

if (newLocation !== 'All files') {
await filesCta.navigateToFolder({ page: page, path: newLocation })
Expand Down
Loading