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

Align components with design in Figma #2 #2352

Merged
merged 2 commits into from
Oct 26, 2022
Merged

Align components with design in Figma #2 #2352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54ffe03
Align components with design in Figma #2
JammingBen Oct 26, 2022
2f50a6f
Fix button outline for groups
JammingBen Oct 26, 2022
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
8 changes: 8 additions & 0 deletions changelog/unreleased/enhancement-input-background-color
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Enhancement: Input background color

The background color for input fields has been adjusted to better match with the overall design.

https://github.com/owncloud/web/issues/7353
https://github.com/owncloud/web/issues/7373
https://github.com/owncloud/owncloud-design-system/pull/2345
https://github.com/owncloud/owncloud-design-system/pull/2352
3 changes: 2 additions & 1 deletion changelog/unreleased/enhancement-remove-button-border
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ The outer border for buttons has been removed. Outline buttons now have an inner

https://github.com/owncloud/web/issues/7353
https://github.com/owncloud/web/issues/7373
https://github.com/owncloud/owncloud-design-system/pull/7861
https://github.com/owncloud/owncloud-design-system/pull/2345
https://github.com/owncloud/owncloud-design-system/pull/2352
7 changes: 0 additions & 7 deletions changelog/unreleased/enhancement-select-hover-state
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions src/components/atoms/OcButton/OcButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ export default {
color: var(--oc-color-text-inverse);
display: inline-flex;
font-weight: 400;
padding: 0.4rem 0.7rem;
padding: 0.5rem 0.8rem;
text-align: left;
text-decoration: none;
Expand Down Expand Up @@ -428,11 +428,15 @@ export default {
}
&-group {
display: flex;
display: inline-flex;
flex-flow: row wrap;
outline: 1px solid var(--oc-color-swatch-primary-default);
outline-offset: -1px;
border-radius: 5px;
.oc-button {
border-radius: 0;
outline: 0;
&:first-of-type {
border-radius: 5px 0 0 5px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/OcSelect/OcSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export default {
&__search::placeholder,
&__dropdown-toggle,
&__dropdown-menu {
background-color: var(--oc-color-background-secondary);
background-color: var(--oc-color-input-bg);
border: 1px solid var(--oc-color-input-border);
color: var(--oc-color-input-text-default);
}
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/ods/color.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ color:
border:
value: rgb(206, 221, 238)
bg:
value: rgb(240, 244, 248)
value: rgb(255, 255, 255)
icon:
folder:
value: rgb(44, 101, 255)
Expand Down