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] Sprint 16 design fixes #6584

Merged
merged 15 commits into from
Mar 17, 2022
Merged
Show file tree
Hide file tree
Changes from 8 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-design-improvements
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Design improvements

We've fixed various design glitches and improved the overall look-and-feel of the UI.

https://github.com/owncloud/web/issues/6492
https://github.com/owncloud/web/issues/6555
https://github.com/owncloud/web/pulls/6584
8 changes: 5 additions & 3 deletions changelog/unreleased/enhancement-update-ods
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
Enhancement: Update ODS to v13.0.0-rc.3
Enhancement: Update ODS to v13.0.0-rc.4

We updated the ownCloud Design System to version 13.0.0-rc.3. Please refer to the full changelog in the ODS release (linked) for more details. Summary:
We updated the ownCloud Design System to version 13.0.0-rc.4. 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
- Change - Remove OcStatusIndicators from OcResource: https://github.com/owncloud/owncloud-design-system/pull/2014
- Enhancement - Redesign OcStatusIndicators: https://github.com/owncloud/owncloud-design-system/pull/2014
- Enhancement - Icons for drawio, ifc and odg resource types: https//github.com/owncloud/owncloud-design-system/pull/2005
- Enhancement - Apply size property to oc-tag: https//github.com/owncloud/owncloud-design-system/pull/2011
- Enhancement - Underline OcResourceName: https//github.com/owncloud/owncloud-design-system/pull/2019
- 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/web/pull/6600
https://github.com/owncloud/owncloud-design-system/releases/tag/v13.0.0-rc.3
https://github.com/owncloud/web/pull/6584
https://github.com/owncloud/owncloud-design-system/releases/tag/v13.0.0-rc.4
16 changes: 15 additions & 1 deletion packages/web-app-files/src/components/ActionMenuItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
<component
:is="action.componentType"
v-bind="getComponentProps(action, items)"
:class="['oc-text-bold', action.class]"
:class="[action.class, 'action-menu-item']"
data-testid="action-handler"
appearance="raw"
pascalwengerter marked this conversation as resolved.
Show resolved Hide resolved
size="small"
v-on="getComponentListeners(action, items)"
>
<oc-img
Expand Down Expand Up @@ -105,3 +107,15 @@ export default {
}
}
</script>
<style lang="scss">
.action-menu-item {
vertical-align: middle;
&:hover {
color: var(--oc-color-swatch-brand-hover);
text-decoration: underline;
.oc-icon > svg {
fill: var(--oc-color-swatch-brand-hover) !important;
}
}
}
</style>
9 changes: 7 additions & 2 deletions packages/web-app-files/src/components/AppBar/AppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
id="files-breadcrumb"
data-testid="files-breadcrumbs"
class="oc-py-s"
context-menu-padding="small"
:items="breadcrumbs"
>
<template #contextMenu>
Expand All @@ -43,8 +44,12 @@
@error="onFileError"
@progress="onFileProgress"
/>
<size-info v-if="hasBulkActions && selectedFiles.length > 0" class="oc-mr oc-visible@l" />
<batch-actions v-if="hasBulkActions" />
<size-info
v-if="hasBulkActions && selectedFiles.length > 0"
class="oc-mr-m oc-visible@l"
style="padding-bottom: calc(1rem + 1px)"
/>
<batch-actions v-if="hasBulkActions" style="padding-bottom: calc(1rem + 1px)" />
</div>
</div>
</div>
Expand Down
12 changes: 10 additions & 2 deletions packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
key="new-file-menu-btn-enabled"
v-oc-tooltip="newButtonTooltip"
:aria-label="newButtonAriaLabel"
variation="inverse"
variation="raw"
:disabled="uploadOrFileCreationBlocked"
class="oc-background-primary-gradient"
>
<oc-icon name="add" />
<oc-icon name="add" color="#ffffff" />
pascalwengerter marked this conversation as resolved.
Show resolved Hide resolved
lookacat marked this conversation as resolved.
Show resolved Hide resolved
<translate>New</translate>
</oc-button>
<oc-drop
Expand Down Expand Up @@ -530,6 +530,10 @@ export default {
}
</script>
<style lang="scss" scoped>
#new-file-menu-btn {
color: white;
lookacat marked this conversation as resolved.
Show resolved Hide resolved
border: 0;
}
#create-list {
li {
border: 1px solid transparent;
Expand All @@ -546,4 +550,8 @@ export default {
margin: 2px 0;
}
}
#upload-list,
#new-file-menu-drop {
min-width: 200px;
}
</style>
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
<template>
<div class="oc-flex oc-flex-middle oc-text-nowrap">
<div class="oc-flex oc-flex-middle oc-text-nowrap size-info">
<oc-button
id="files-clear-selection"
v-oc-tooltip="clearSelectionLabel"
:aria-label="clearSelectionLabel"
class="oc-mr-s"
appearance="raw"
@click="RESET_SELECTION"
>
<oc-icon name="close" />
</oc-button>
<translate
v-if="selectedResourcesSize !== '?'"
key="multiple-select-info-with-size"
:translate-n="selectedResourcesAmount"
:translate-params="{ amount: selectedResourcesAmount, size: selectedResourcesSize }"
translate-plural="%{ amount } selected items - %{ size }"
pascalwengerter marked this conversation as resolved.
Show resolved Hide resolved
translate-plural="%{ amount } items - %{ size }"
translate-comment="Number of selected resources and their size displayed above the files list"
>%{ amount } selected item - %{ size }
lookacat marked this conversation as resolved.
Show resolved Hide resolved
</translate>
Expand All @@ -14,19 +24,10 @@
key="multiple-select-info"
:translate-n="selectedResourcesAmount"
:translate-params="{ amount: selectedResourcesAmount }"
translate-plural="%{ amount } selected items"
pascalwengerter marked this conversation as resolved.
Show resolved Hide resolved
translate-plural="%{ amount } items"
translate-comment="Number of selected resources displayed above the files list"
>%{ amount } selected item
lookacat marked this conversation as resolved.
Show resolved Hide resolved
</translate>
<oc-button
id="files-clear-selection"
v-oc-tooltip="clearSelectionLabel"
:aria-label="clearSelectionLabel"
class="oc-ml"
@click="RESET_SELECTION"
>
<oc-icon name="close" />
</oc-button>
</div>
</template>

Expand Down Expand Up @@ -66,3 +67,8 @@ export default {
}
}
</script>
<style lang="scss">
.size-info span {
color: var(--oc-color-swatch-passive-default);
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,11 @@ export default {
text-align: left;
white-space: normal;

li {
padding: 6px;
> li {
&:hover {
background-color: var(--oc-color-background-hover);
}
}

> li {
a,
button,
span {
Expand All @@ -227,6 +224,11 @@ export default {
vertical-align: top;
width: 100%;
text-align: left;

&:hover {
color: var(--oc-color-swatch-passive-default);
text-decoration: none !important;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ export default {
hover: {
type: Boolean,
required: false,
default: false
default: true
},
/**
* Show that the table is sorted by this column (no actual sorting takes place)
Expand Down
Loading