Skip to content
This repository has been archived by the owner on Jan 3, 2024. It is now read-only.

Redesign FilesTable #1958

Merged
merged 8 commits into from
Feb 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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-filestable
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Redesign FilesTable
lookacat marked this conversation as resolved.
Show resolved Hide resolved

We've adjusted OcTable, OcResource, OcDrop and OcCheckbox
to fit the redesign.

https://github.com/owncloud/owncloud-design-system/pull/1958
https://github.com/owncloud/web/issues/6207
6 changes: 3 additions & 3 deletions src/components/atoms/OcDrop/__snapshots__/OcDrop.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ exports[`OcDrop tippy renders tippy 1`] = `
id="oc-drop-15"
>
<div
class="oc-card oc-card-body oc-rounded oc-background-highlight oc-p-m"
class="oc-card oc-card-body oc-rounded oc-background-secondary oc-p-m"
>
show
</div>
Expand Down Expand Up @@ -82,7 +82,7 @@ exports[`OcDrop tippy renders tippy 2`] = `
id="oc-drop-15"
>
<div
class="oc-card oc-card-body oc-rounded oc-background-highlight oc-p-m"
class="oc-card oc-card-body oc-rounded oc-background-secondary oc-p-m"
>
show
</div>
Expand Down Expand Up @@ -129,7 +129,7 @@ exports[`OcDrop tippy renders tippy 3`] = `
id="oc-drop-15"
>
<div
class="oc-card oc-card-body oc-rounded oc-background-highlight oc-p-m"
class="oc-card oc-card-body oc-rounded oc-background-secondary oc-p-m"
>
show
</div>
Expand Down
15 changes: 12 additions & 3 deletions src/components/molecules/OcTable/OcTable.sort.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@ describe("OcTable.sort", () => {
const wrapper = mount(Table, {
propsData: {
fields: [...tableFields],
data,
data
},
stubs: {
"oc-icon": true
}
})
const headers = wrapper.findAll("thead th")
it("has any [aria-sort] attribute on all sortable column headers", () => {
Expand Down Expand Up @@ -114,8 +117,11 @@ describe("OcTable.sort", () => {
fields: tableFields,
sortBy: tableFieldId.name,
sortDir: tableFieldId.sortDir,
data,
data
},
stubs: {
"oc-icon": true
}
})

const headers = wrapper.findAll("thead th")
Expand Down Expand Up @@ -156,8 +162,11 @@ describe("OcTable.sort", () => {
fields: tableFields,
data,
sortBy: sortByOld,
sortDir: sortDirOld,
sortDir: sortDirOld
},
stubs: {
"oc-icon": true
}
})

const headers = wrapper.findAll("thead th")
Expand Down
13 changes: 5 additions & 8 deletions src/components/molecules/OcTable/OcTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,11 @@ export default {

&-thead-content {
vertical-align: middle;
display: inline-table;
color: var(--oc-color-swatch-passive-default);
&:hover {
text-decoration: underline;
}
}

&-footer {
Expand All @@ -532,14 +537,6 @@ export default {
.header-text:hover + .oc-button-sort {
opacity: 1;
}
.header-text {
vertical-align: middle;
display: inline-table;
color: var(--oc-color-swatch-inverse-default);
&:hover {
text-decoration: underline;
}
}
.oc-button-sort {
opacity: 0;
display: inline-table;
Expand Down