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.

Sign up for GitHub

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

fix(ffe-datepicker): fix text zoom #1941

Merged
merged 1 commit into from
Apr 25, 2024
Merged

fix(ffe-datepicker): fix text zoom #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 17 additions & 19 deletions packages/ffe-datepicker/less/calendar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.ffe-calendar {
border: solid 2px var(--ffe-g-border-color);
border-radius: var(--ffe-g-border-radius);
padding: @ffe-spacing-2xs;
padding: var(--ffe-spacing-2xs);
background: var(--ffe-farge-hvit);
overflow-y: auto;
.native & {
@media (prefers-color-scheme: dark) {
background-color: var(--ffe-farge-svart);
Expand All @@ -11,10 +12,10 @@

&--datepicker {
position: absolute;
top: 55px;
transform: translateY(var(--ffe-spacing-xs));
left: 0;
z-index: 9999;
width: 320px;
width: fit-content;

&--above {
top: inherit;
Expand All @@ -25,12 +26,13 @@

&__header {
text-align: center;
padding: @ffe-spacing-sm @ffe-spacing-2xs @ffe-spacing-2xs;
padding: var(--ffe-spacing-sm) var(--ffe-spacing-2xs)
var(--ffe-spacing-2xs);
width: 100%;
}

&__month {
padding-right: @ffe-spacing-xs;
padding-right: var(--ffe-spacing-xs);
}

&__month-nav {
Expand All @@ -57,20 +59,16 @@
&__icon-prev,
&__icon-next {
color: var(--ffe-v-datepicker-icon-color);
vertical-align: middle;
}

&__next {
width: 25px;
height: 25px;
}

&__next,
&__previous {
width: 25px;
height: 25px;
height: 1.5625rem;
aspect-ratio: 1;
}

&__month-nav-icon {
display: block;
height: 2em;
width: 2em;
fill: var(--ffe-v-datepicker-icon-color);
Expand All @@ -94,11 +92,11 @@
&__grid {
width: 100%;
border-spacing: 0.5em 0;
color: @ffe-black;
color: var(--ffe-farge-svart);

&:focus {
outline: none;
box-shadow: 0 0 0 2px @ffe-farge-vann;
box-shadow: 0 0 0 2px var(--ffe-farge-vann);
border-radius: 4px;
}
}
Expand All @@ -111,7 +109,7 @@
}

&__day {
padding: @ffe-spacing-2xs 0;
padding: var(--ffe-spacing-2xs) 0;
text-align: center;
outline: none;
}
Expand All @@ -121,12 +119,12 @@

font-size: 1rem;
background-color: var(--ffe-v-datepicker-bg-color);
width: 35px;
height: 35px;
width: 2.1875rem;
aspect-ratio: 1;
color: var(--ffe-v-datepicker-date-color);
border-radius: 4px;
display: inline-block;
line-height: 2.1875rem;
line-height: 2.1875;
border: 2px solid transparent;
cursor: pointer;

Expand Down
28 changes: 16 additions & 12 deletions packages/ffe-datepicker/less/dateinput.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

&__field {
min-width: 160px;
grid-column: 1/3;
grid-row: 1/-1;
&::-ms-clear {
display: none;
}
Expand All @@ -34,20 +36,21 @@
}

&--wrapper {
display: flex;
display: grid;
grid-template-columns: 1fr auto;
}

&__button {
background-color: transparent;
border: 2px solid transparent;
height: 45px;
width: 56px;
grid-column: 2/3;
grid-row: 1/-1;
outline: none;
margin-left: -56px;
cursor: pointer;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
transition: all var(--ffe-transition-duration) var(--ffe-ease);
width: 56px;
cursor: pointer;

&:focus,
&:active {
Expand All @@ -58,11 +61,10 @@
&:hover {
border-color: var(--ffe-v-datepicker-border-hover-color);
}
}

.ffe-dateinput__field:focus + &:hover {
border-color: transparent;
box-shadow: 0 0 0 2px var(--ffe-v-datepicker-border-hover-color);
.ffe-dateinput__field:focus + &:hover {
border-color: transparent;
box-shadow: 0 0 0 2px var(--ffe-v-datepicker-border-hover-color);
}
}
}

Expand All @@ -71,8 +73,10 @@
color: var(--ffe-v-datepicker-icon-color);
transition: color var(--ffe-transition-duration) var(--ffe-ease);

.ffe-datepicker__button:hover & {
color: var(--ffe-v-datepicker-icon-color-hover);
@media (hover: hover) and (pointer: fine) {
.ffe-datepicker__button:hover & {
color: var(--ffe-v-datepicker-icon-color-hover);
}
}
}
}
Loading