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 main layout #6086

Merged
merged 15 commits into from
Dec 30, 2021
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 48 additions & 0 deletions __fixtures__/sidebarNavItems.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
export default [
{
name: "All files",
iconMaterial: "folder",
route: {
name: "files-personal",
path: "/files/list/all"
},
active: true
},
{
name: "Shared with me",
iconMaterial: "shared-with-me",
route: {
name: "files-shared-with-me",
path: "/files/list/shared-with-me"
},
active: false
},
{
name: "Shared with others",
iconMaterial: "shared-with-others",
route: {
name: "files-shared-with-others",
path: "/files/list/shared-with-others"
},
active: false
},
{
name: "Shared via link",
iconMaterial: "link",
route: {
name: "files-shared-via-link",
path: "/files/list/shared-via-link"
},
active: false
},
{
name: "Deleted files",
iconMaterial: "delete",
route: {
name: "files-trashbin",
path: "/files/list/trash-bin"
},
active: false
}
]

8 changes: 8 additions & 0 deletions changelog/unreleased/enhancement-redesign-main-layout
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Enhancement: Redesign main layout

We've started to implement the redesign by adjusting the sidebar,
topbar and appswitcher.
While doing so, we also removed the `vue2-touch-events` dependency.

https://github.com/owncloud/web/issues/6036
https://github.com/owncloud/web/pull/6086
2 changes: 0 additions & 2 deletions packages/web-app-files/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ main {
}

.files-list-wrapper {
pascalwengerter marked this conversation as resolved.
Show resolved Hide resolved
height: 100%;
max-height: 100%;
overflow-y: auto;
display: grid;
grid-template-columns: 1fr;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
exports[`List component when no resource is found should show no-content-message component 1`] = `
<div class="files-search-result">
<div class="uk-height-1-1 uk-flex uk-flex-column uk-flex-center uk-flex-middle uk-text-center files-empty">
<div class="oc-icon oc-icon-xxl oc-icon-passive"><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" version="1.0" viewBox="0 0 16 16" height="16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" aria-hidden="true" focusable="false">
<g xmlns="http://www.w3.org/2000/svg" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)">
<path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.53117v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z"></path>
</g>
<div class="oc-icon oc-icon-xxl oc-icon-passive"><svg height="24" width="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
<path xmlns="http://www.w3.org/2000/svg" fill="none" d="M0 0h24v24H0z"></path>
<path xmlns="http://www.w3.org/2000/svg" d="M12.414 5H21a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h7.414l2 2z"></path>
</svg></div>
<div class="oc-text-muted uk-text-large">
<p class="oc-text-muted"><span data-msgid="No search term entered" data-current-language="en_US">No search term entered</span></p>
Expand All @@ -19,10 +18,9 @@ exports[`List component when no resource is found should show no-content-message
exports[`List component when no search term is entered should show no-content-message component 1`] = `
<div class="files-search-result">
<div class="uk-height-1-1 uk-flex uk-flex-column uk-flex-center uk-flex-middle uk-text-center files-empty">
<div class="oc-icon oc-icon-xxl oc-icon-passive"><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" version="1.0" viewBox="0 0 16 16" height="16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" aria-hidden="true" focusable="false">
<g xmlns="http://www.w3.org/2000/svg" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)">
<path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.53117v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z"></path>
</g>
<div class="oc-icon oc-icon-xxl oc-icon-passive"><svg height="24" width="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
<path xmlns="http://www.w3.org/2000/svg" fill="none" d="M0 0h24v24H0z"></path>
<path xmlns="http://www.w3.org/2000/svg" d="M12.414 5H21a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h7.414l2 2z"></path>
</svg></div>
<div class="oc-text-muted uk-text-large">
<p class="oc-text-muted"><span data-msgid="No search term entered" data-current-language="en_US">No search term entered</span></p>
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-markdown-editor/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<main id="markdown-editor">
<main id="markdown-editor" class="oc-mx-s oc-my-s">
<markdown-editor-app-bar />
<oc-notifications>
<oc-notification-message
Expand Down
3 changes: 0 additions & 3 deletions packages/web-app-media-viewer/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,6 @@ export default {
</script>

<style lang="scss" scoped>
#mediaviewer {
min-height: 100vh;
}
.media-viewer-player {
max-width: 90vw;
height: 70vh;
Expand Down
3 changes: 1 addition & 2 deletions packages/web-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"lodash-es": "^4.17.21",
"luxon": "^2.0.0",
"oidc-client": "1.11.5",
"owncloud-design-system": "12.0.0-alpha3",
"owncloud-design-system": "12.0.0-alpha4",
"owncloud-sdk": "1.0.0-2296",
"p-queue": "^6.1.1",
"popper-max-size-modifier": "^0.2.0",
Expand All @@ -38,7 +38,6 @@
"vue-router": "^3.1.3",
"vue-scrollto": "^2.15.0",
"vue-select": "^3.13.2",
"vue2-touch-events": "^3.2.2",
"vuex": "^3.6.2",
"vuex-extensions": "^1.1.5",
"vuex-persist": "3.1.3",
Expand Down