-
Notifications
You must be signed in to change notification settings - Fork 59
[UIK-5614][date-picker] changed border-radius in calendar #3097
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
base: UIK-5351/add-more-variables-to-theme
Are you sure you want to change the base?
Changes from all commits
5f9c8c7
788d11e
cf49812
2bc693b
dd12360
81a0a2b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| SCalendar { | ||
| display: flex; | ||
| flex-direction: column; | ||
| border-radius: var(--intergalactic-surface-rounded, 8px); | ||
| border-radius: var(--intergalactic-rounded-small, 4px); | ||
| gap: var(--intergalactic-spacing-content-gap-small, 4px); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this gap is visible between the mon/tue/wed row and the days |
||
|
|
||
| SCalendarUnit:focus-visible { | ||
| outline: none; | ||
|
|
@@ -12,11 +13,12 @@ SGridDays { | |
| display: grid; | ||
| grid-template-columns: repeat(7, minmax(32px, auto)); | ||
| grid-template-rows: repeat(auto-fit, minmax(32px, auto)); | ||
| grid-row-gap: var(--intergalactic-spacing-content-gap-small, 4px); | ||
| } | ||
|
|
||
| SGridMonths { | ||
| display: grid; | ||
| grid-row-gap: var(--intergalactic-spacing-2x, 8px); | ||
| grid-row-gap: var(--intergalactic-spacing-content-gap-large, 8px); | ||
| grid-template-columns: repeat(3, minmax(60px, auto)); | ||
| grid-template-rows: repeat(4, minmax(32px, auto)); | ||
| } | ||
|
|
@@ -55,7 +57,7 @@ SCalendarUnit { | |
| background-color: var(--intergalactic-date-picker-cell, oklch(1 0 0)); | ||
|
|
||
| align-items: center; | ||
| border-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-radius: var(--intergalactic-rounded-small, 4px); | ||
| box-sizing: border-box; | ||
| cursor: pointer; | ||
| display: flex; | ||
|
|
@@ -67,7 +69,6 @@ SCalendarUnit { | |
| transition: border-radius 0.15s 0.15s; | ||
| outline: none; | ||
| margin: 0; | ||
| margin-top: 4px; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I replaced this margin with a gap for GridDays. Month grid became tighter as a result - this is expected |
||
|
|
||
| &:hover { | ||
| color: var(--intergalactic-text-primary, oklch(0.1 0.03 137 / 0.899)); | ||
|
|
@@ -82,7 +83,7 @@ SCalendarUnit[today] { | |
| display: block; | ||
| top: 1px; | ||
| left: 1px; | ||
| border-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-radius: var(--intergalactic-rounded-small, 4px); | ||
| width: calc(100% - 2px); | ||
| height: calc(100% - 2px); | ||
| box-sizing: border-box; | ||
|
|
@@ -124,9 +125,9 @@ SCalendarUnit[startSelected] { | |
| background-color: var(--intergalactic-date-picker-cell-active, oklch(0.23 0.01 140)); | ||
|
|
||
| &:not([highlighted]) { | ||
| border-bottom-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-bottom-right-radius: 0; | ||
| border-top-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-top-right-radius: 0; | ||
| } | ||
|
|
||
|
|
@@ -142,9 +143,9 @@ SCalendarUnit[endSelected] { | |
|
|
||
| &:not([highlighted]) { | ||
| border-bottom-left-radius: 0; | ||
| border-bottom-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-top-left-radius: 0; | ||
| border-top-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
|
|
||
| &:hover { | ||
|
|
@@ -154,31 +155,31 @@ SCalendarUnit[endSelected] { | |
| } | ||
|
|
||
| SCalendarUnit[startHighlighted]:not([selected]) { | ||
| border-bottom-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-bottom-right-radius: 0; | ||
| border-top-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-top-right-radius: 0; | ||
| } | ||
|
|
||
| SCalendarUnit[endHighlighted]:not([selected]) { | ||
| border-bottom-left-radius: 0; | ||
| border-bottom-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-top-left-radius: 0; | ||
| border-top-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
|
|
||
| SCalendarUnit[startHighlighted]SCalendarUnit[endHighlighted] { | ||
| border-bottom-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-bottom-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-top-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-top-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
|
|
||
| SCalendarUnit[startSelected]SCalendarUnit[endSelected] { | ||
| border-bottom-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-bottom-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-top-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-top-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
|
|
||
| SCalendarUnit[compareHighlighted] { | ||
|
|
@@ -208,23 +209,23 @@ SCalendarUnit[compareEnd] { | |
| } | ||
|
|
||
| SCalendarUnit[compareStartHighlighted] { | ||
| border-top-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-bottom-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
|
|
||
| SCalendarUnit[compareEndHighlighted] { | ||
| border-top-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-bottom-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
|
|
||
| SCalendarUnit[compareStart]:not([compareHighlighted]) { | ||
| border-top-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-left-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-bottom-left-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
|
|
||
| SCalendarUnit[compareEnd]:not([compareHighlighted]) { | ||
| border-top-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-bottom-right-radius: var(--intergalactic-control-rounded, 6px); | ||
| border-top-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| border-bottom-right-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
|
|
||
| SCalendarUnit[outdated] { | ||
|
|
@@ -243,7 +244,7 @@ SCalendar:focus { | |
| } | ||
|
|
||
| &:not(&:has(SCalendarUnit[highlighted])) { | ||
| border-radius: var(--intergalactic-surface-rounded, 8px); | ||
| border-radius: var(--intergalactic-rounded-small, 4px); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this border radius affects focus outline on the calendar in some cases, can be seen in our test story http://localhost:6006/?path=/story/components-datepicker-tests--custom-day-fixed-for-tests