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

Reduce border radius of components #5483

Merged
merged 1 commit into from
May 27, 2024
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
4 changes: 2 additions & 2 deletions src/assets/NcAppNavigationItem.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
min-height: $clickable-area;
transition: background-color var(--animation-quick) ease-in-out;
transition: background-color 200ms ease-in-out;
border-radius: var(--border-radius-pill);
border-radius: var(--border-radius-new-design, var(--border-radius-pill));

&-wrapper {
position: relative;
Expand Down Expand Up @@ -117,7 +117,7 @@
&:focus-visible {
box-shadow: 0 0 0 4px var(--color-main-background);
outline: 2px solid var(--color-main-text);
border-radius: var(--border-radius-pill);
border-radius: var(--border-radius-new-design, var(--border-radius-pill));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/NcButton/NcButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ export default {
span {
cursor: pointer;
}
border-radius: math.div($clickable-area, 2);
border-radius: var(--border-radius-new-design, math.div($clickable-area, 2));
transition-property: color, border-color, background-color;
transition-duration: 0.1s;
transition-timing-function: linear;
Expand Down Expand Up @@ -841,7 +841,7 @@ export default {
box-shadow: 0 0 0 4px var(--color-main-background) !important;
&.button-vue--vue-tertiary-on-primary {
outline: 2px solid var(--color-primary-element-text);
border-radius: var(--border-radius);
border-radius: var(--border-radius-new-design, var(--border-radius));
background-color: transparent;
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/components/NcListItem/NcListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -801,9 +801,7 @@ export default {
// 4px padding for the focus-visible styles. Width is reduced to compensate it
margin: 4px;
width: calc(100% - 8px);
// Fix for border-radius being too large for 3-line entries like in Mail
// 44px avatar size / 2 + 8px padding, and 2px for better visual quality
border-radius: 32px;
border-radius: var(--border-radius-new-design, 32px);
cursor: pointer;
transition: background-color var(--animation-quick) ease-in-out;
list-style: none;
Expand Down
Loading