Skip to content

Commit bff6f4c

Browse files
committed
Fix the style of the thumbnails in HCM (bug 2016491, bug 2016321, bug 2016323, bug 2016827)
1 parent 74ab1a9 commit bff6f4c

1 file changed

Lines changed: 96 additions & 9 deletions

File tree

web/views_manager.css

Lines changed: 96 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,13 @@
9494
--image-current-focused-outline-color: var(--image-hover-border-color);
9595
--image-page-number-bg: light-dark(#f0f0f4, #23222b);
9696
--image-page-number-fg: var(--text-color);
97+
--image-page-number-border-color: transparent;
98+
--image-hover-page-number-bg: var(--image-page-number-bg);
99+
--image-hover-page-number-fg: var(--image-page-number-fg);
97100
--image-current-page-number-bg: var(--image-current-border-color);
98101
--image-current-page-number-fg: light-dark(#fff, #15141a);
102+
--image-current-hover-page-number-bg: var(--image-current-page-number-bg);
103+
--image-current-hover-page-number-fg: var(--image-current-page-number-fg);
99104
--image-shadow:
100105
0 0.375px 1.5px 0 light-dark(rgb(0 0 0 / 0.05), rgb(0 0 0 / 0.2)),
101106
0 0 0 1px var(--image-border-color),
@@ -122,6 +127,7 @@
122127
calc(3 * var(--image-border-width) / 2) var(--image-current-border-color);
123128
--image-dragging-shadow: 0 0 0 var(--image-border-width)
124129
var(--image-current-border-color);
130+
--multiple-dragging-indicator-bg: var(--indicator-color);
125131
--multiple-dragging-text-color: light-dark(#fbfbfe, #15141a);
126132

127133
@media screen and (forced-colors: active) {
@@ -145,15 +151,24 @@
145151
--status-warning-bg: none;
146152
--indicator-warning-color: CanvasText;
147153
--header-shadow: none;
148-
--image-shadow: 0 0 0 1px CanvasText;
149-
--image-outline: 1px solid CanvasText;
150-
--image-border-color: CanvasText;
154+
--image-shadow: none;
155+
--image-outline: 1px solid ButtonText;
156+
--image-focus-outline-color: CanvasText;
151157
--image-hover-border-color: SelectedItem;
152-
--image-current-border-color: ButtonBorder;
158+
--image-hover-page-number-bg: SelectedItemText;
159+
--image-hover-page-number-fg: SelectedItem;
160+
--image-current-page-number-bg: ButtonText;
161+
--image-current-page-number-fg: ButtonFace;
162+
--image-current-border-color: ButtonText;
153163
--image-current-focused-outline-color: var(--image-hover-border-color);
164+
--image-current-hover-page-number-bg: SelectedItem;
165+
--image-current-hover-page-number-fg: SelectedItemText;
154166
--image-page-number-bg: ButtonFace;
155-
--image-page-number-fg: CanvasText;
167+
--image-page-number-fg: ButtonText;
168+
--image-page-number-border-color: var(--image-page-number-fg);
156169
--multiple-dragging-bg: Canvas;
170+
--multiple-dragging-indicator-bg: ButtonBorder;
171+
--multiple-dragging-text-color: Canvas;
157172
}
158173

159174
display: flex;
@@ -605,6 +620,7 @@
605620
&:not(.isDragging) > .thumbnailImageContainer::after {
606621
content: attr(page-number);
607622
border-radius: 8px;
623+
border: 1px solid var(--image-page-number-border-color);
608624
background-color: var(--image-page-number-bg);
609625
color: var(--image-page-number-fg);
610626
position: absolute;
@@ -613,10 +629,11 @@
613629
min-width: 32px;
614630
height: 16px;
615631
text-align: center;
632+
box-sizing: content-box;
616633
translate: calc(var(--dir-factor) * 50%);
617634

618635
font: menu;
619-
font-size: 13px;
636+
font-size: 12px;
620637
font-style: normal;
621638
font-weight: 400;
622639
line-height: normal;
@@ -629,6 +646,7 @@
629646
> .thumbnailImageContainer::after {
630647
background-color: var(--image-current-page-number-bg);
631648
color: var(--image-current-page-number-fg);
649+
outline: 1px solid var(--image-current-border-color);
632650
}
633651

634652
&.isDragging > input {
@@ -654,8 +672,8 @@
654672
img {
655673
width: 100%;
656674
height: 100%;
657-
border: inherit;
658-
border-radius: inherit;
675+
border: none;
676+
border-radius: 8px;
659677
outline: none;
660678
user-select: none;
661679
pointer-events: none;
@@ -668,23 +686,87 @@
668686
&:hover {
669687
cursor: pointer;
670688
box-shadow: var(--image-hover-shadow);
689+
690+
&::after {
691+
background-color: var(--image-hover-page-number-bg);
692+
color: var(--image-hover-page-number-fg);
693+
}
694+
695+
@media screen and (forced-colors: active) {
696+
/* box-shadow isn't rendered in HCM */
697+
box-shadow: none;
698+
outline: var(--image-border-width) var(--image-hover-border-color)
699+
solid;
700+
}
671701
}
672702

673703
&:focus-visible {
674704
&:not([aria-current="page"]) {
675705
box-shadow: var(--image-hover-shadow);
676706
outline: none;
707+
708+
@media screen and (forced-colors: active) {
709+
/* box-shadow isn't rendered in HCM */
710+
box-shadow: none;
711+
outline: var(--image-border-width)
712+
var(--image-focus-outline-color) solid;
713+
}
677714
}
678715

679716
&[aria-current="page"] {
680717
outline: var(--image-border-width) solid
681718
var(--image-current-focused-outline-color);
682719
outline-offset: var(--image-border-width);
720+
721+
@media screen and (forced-colors: active) {
722+
/* box-shadow isn't rendered in HCM */
723+
box-shadow: none;
724+
outline: var(--image-border-width)
725+
var(--image-current-border-color) solid;
726+
outline-offset: 0;
727+
728+
> img {
729+
outline: var(--image-border-width)
730+
var(--image-focus-outline-color) solid;
731+
outline-offset: var(--image-border-width);
732+
}
733+
}
734+
}
735+
736+
@media screen and (forced-colors: active) {
737+
/* box-shadow isn't rendered in HCM */
738+
box-shadow: none;
739+
outline: var(--image-border-width)
740+
var(--image-current-border-color) solid;
741+
742+
&:hover > img {
743+
outline: var(--image-border-width)
744+
var(--image-hover-border-color) solid;
745+
outline-offset: var(--image-border-width);
746+
}
683747
}
684748
}
685749

686750
&[aria-current="page"] {
687751
box-shadow: var(--image-current-shadow);
752+
753+
&:hover::after {
754+
background-color: var(--image-current-hover-page-number-bg);
755+
color: var(--image-current-hover-page-number-fg);
756+
}
757+
758+
@media screen and (forced-colors: active) {
759+
/* box-shadow isn't rendered in HCM */
760+
box-shadow: none;
761+
outline: var(--image-border-width)
762+
var(--image-current-border-color) solid;
763+
764+
&:hover > img {
765+
outline: var(--image-border-width)
766+
var(--image-hover-border-color) solid;
767+
outline-offset: var(--image-border-width);
768+
}
769+
}
688770
}
689771

690772
&.placeholder {
@@ -705,6 +787,11 @@
705787
&.multiple {
706788
box-shadow: var(--image-multiple-dragging-shadow);
707789

790+
@media screen and (forced-colors: active) {
791+
forced-color-adjust: none;
792+
box-shadow: var(--image-multiple-dragging-shadow);
793+
}
794+
708795
> .thumbnailImageContainer {
709796
position: absolute;
710797
top: 0;
@@ -721,7 +808,7 @@
721808
&::after {
722809
content: attr(data-multiple-count);
723810
border-radius: calc(8px * var(--thumbnail-dragging-scale));
724-
background-color: var(--indicator-color);
811+
background-color: var(--multiple-dragging-indicator-bg);
725812
color: var(--multiple-dragging-text-color);
726813
position: absolute;
727814
inset-block-end: calc(4px * var(--thumbnail-dragging-scale));

0 commit comments

Comments
 (0)