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

Small fixes #2036

Merged
merged 4 commits into from
Mar 21, 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
6 changes: 6 additions & 0 deletions changelog/unreleased/bugfix-transparent-ocselect-background
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: OcSelect transparent background

We fixed a non-transparent background in the OcSelect button, leading to visual glitches.

https://github.com/owncloud/owncloud-design-system/issues/2030
https://github.com/owncloud/owncloud-design-system/pull/2036
6 changes: 6 additions & 0 deletions changelog/unreleased/enhancement-primary-button-gradient
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Make filled primary OcButton use gradient background

We've updated the OcButton to use the gradient background color when used in its `filled` appearance.

https://github.com/owncloud/owncloud-design-system/issues/1952
https://github.com/owncloud/owncloud-design-system/pull/2036
20 changes: 6 additions & 14 deletions src/components/atoms/OcButton/OcButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,26 +130,15 @@ export default {
},
computed: {
$_ocButton_buttonClass() {
const classes = [
return [
"oc-button",
"oc-rounded",
`oc-button-${getSizeClass(this.size)}`,
`oc-button-justify-content-${this.justifyContent}`,
`oc-button-gap-${getSizeClass(this.gapSize)}`,
`oc-button-${this.variation}`,
`oc-button-${this.variation}-${this.appearance}`,
]

classes.push(`oc-button-${this.variation}`)

switch (this.appearance) {
case "raw":
classes.push(`oc-button-${this.variation}-raw`)
break
case "outline":
classes.push(`oc-button-${this.variation}-outline`)
break
}

return classes
},

additionalAttributes() {
Expand Down Expand Up @@ -358,6 +347,9 @@ export default {
var(--oc-color-swatch-primary-hover),
var(--oc-color-swatch-primary-muted)
);
&-filled {
@extend .oc-background-primary-gradient;
}
}

&-success {
Expand Down
1 change: 1 addition & 0 deletions src/components/atoms/OcSelect/OcSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:disabled="disabled"
:filter="filter"
class="oc-select"
style="background: transparent"
v-bind="additionalAttributes"
v-on="$listeners"
>
Expand Down
4 changes: 2 additions & 2 deletions src/components/molecules/OcTable/OcTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
import Vue from "vue"
import OcThead from "../../atoms/_OcTableHeader/_OcTableHeader.vue"
import OcTbody from "../../atoms/_OcTableBody/_OcTableBody.vue"
import OcTr from "../../atoms/_OcTableRow/_OcTableRow"
import OcTh from "../../atoms/_OcTableCellHead/_OcTableCellHead"
import OcTr from "../../atoms/_OcTableRow/_OcTableRow.vue"
import OcTh from "../../atoms/_OcTableCellHead/_OcTableCellHead.vue"
import OcTd from "../../atoms/_OcTableCellData/_OcTableCellData.vue"
import OcGhostElement from "../../atoms/_OcGhostElement/_OcGhostElement.vue"
import OcButton from "../../atoms/OcButton/OcButton.vue"
Expand Down
2 changes: 1 addition & 1 deletion src/styles/theme/background.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
border-color:
linear-gradient(90deg,
var(--oc-color-swatch-primary-muted) 0%,
var(--oc-color-swatch-primary-gradient) 100%);
var(--oc-color-swatch-primary-gradient) 100%) !important;
}
/* stylelint-enable */

Expand Down
Loading