Skip to content

Make sure the menuitems are readable when hovering them (bug 2023138) #20923

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

Merged
calixteman merged 1 commit into from
Mar 20, 2026
+85 −114
Merged

Make sure the menuitems are readable when hovering them (bug 2023138) #20923

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
133 changes: 60 additions & 73 deletions web/menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ button.hasPopupMenu {
--menu-mark-icon-size: 16px;
}

> li {
> button {
display: flex;
align-items: center;
list-style: none;
position: relative;
width: 100%;
height: 26px;
padding-inline: calc(var(--menu-mark-icon-size) + var(--menuitem-gap))
Expand All @@ -119,7 +119,7 @@ button.hasPopupMenu {
border: 1px solid var(--menuitem-border-color);
background: transparent;

&:has(button.selected)::before {
&.selected::after {
content: "";
display: inline-block;
width: 11px;
Expand All @@ -129,101 +129,88 @@ button.hasPopupMenu {
mask-image: var(--menuitem-checkmark-icon);
background-color: var(--menu-text-color);
position: absolute;
margin-inline-start: -16px;
inset-inline-start: var(--menuitem-gap);
top: 50%;
transform: translateY(-50%);
}

&:has(button:disabled) {
&:disabled {
opacity: var(--disabled-opacity);
pointer-events: none;

&:has(button.selected)::before {
&.selected::after {
background-color: var(--menu-text-disabled-color);
}

&:not(.noIcon)::before {
background-color: var(--menu-text-disabled-color);
}

> span {
color: var(--menu-text-disabled-color);
}
}

&:hover {
background: var(--menuitem-hover-bg);
background-blend-mode: var(--menuitem-hover-background-blend-mode);
> button {
&:not(:disabled) {
&:hover {
background: var(--menuitem-hover-bg);
background-blend-mode: var(--menuitem-hover-background-blend-mode);

&:not(.noIcon)::before {
background-color: var(--menuitem-text-hover-fg);
}

> span {
color: var(--menuitem-text-hover-fg);
}

&.selected::after {
background-color: var(--menuitem-text-hover-fg);
}
}
&:has(button.selected)::before {
background-color: var(--menuitem-text-hover-fg);

&:active {
background-color: var(--menuitem-active-bg);
border-color: var(--menuitem-active-border-color);

> span {
color: var(--menuitem-text-active-fg);
}
}
}

&:active {
background-color: var(--menuitem-active-bg);
border-color: var(--menuitem-active-border-color);
> button > span {
color: var(--menuitem-text-active-fg);
&:focus-visible {
border-color: var(--menuitem-focus-border-color);
background-color: var(--menuitem-focus-bg);
outline: 2px solid var(--menuitem-focus-outline-color);
outline-offset: 2px;
}
}

&:has(> button:focus-visible) {
border-color: var(--menuitem-focus-border-color);
background-color: var(--menuitem-focus-bg);
outline: 2px solid var(--menuitem-focus-outline-color);
outline-offset: 2px;
&:not(.noIcon)::before {
display: inline-block;
width: var(--menu-icon-size);
height: var(--menu-icon-size);
content: "";
mask-size: cover;
mask-position: center;
background-color: var(--menu-text-color);
}

> button {
> span {
display: flex;
flex-direction: row;
align-items: center;
align-self: stretch;
width: 100%;
height: auto;
padding: var(--menuitem-gap);
gap: var(--menuitem-gap);
background: transparent;
border: none;

&:not(.noIcon)::before {
display: inline-block;
width: var(--menu-icon-size);
height: var(--menu-icon-size);
content: "";
mask-size: cover;
mask-position: center;
background-color: var(--menu-text-color);
}

&:focus-visible {
outline: none;
}

> span {
display: inline-block;
width: max-content;
height: auto;
text-align: start;
color: var(--menu-text-color);
user-select: none;
padding-inline-start: 6px;

font: menu;
font-size: 13px;
font-style: normal;
font-weight: 510;
line-height: normal;
}

&:disabled {
pointer-events: none;

&:not(.noIcon)::before {
background-color: var(--menu-text-disabled-color);
}

> span {
color: var(--menu-text-disabled-color);
}
}
min-width: max-content;
text-align: start;
color: var(--menu-text-color);
user-select: none;
padding-inline-start: 6px;

font: menu;
font-size: 13px;
font-style: normal;
font-weight: 510;
line-height: normal;
}
}
}
64 changes: 24 additions & 40 deletions web/viewer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,26 +142,18 @@
<span data-l10n-id="pdfjs-views-manager-view-selector-button-label"></span>
</button>
<menu id="viewsManagerSelectorOptions" role="listbox" class="popupMenu withMark">
<li>
<button id="thumbnailsViewMenu" role="option" type="button" tabindex="-1">
<span data-l10n-id="pdfjs-views-manager-pages-option-label"></span>
</button>
</li>
<li>
<button id="outlinesViewMenu" role="option" type="button" tabindex="-1">
<span data-l10n-id="pdfjs-views-manager-outlines-option-label"></span>
</button>
</li>
<li>
<button id="attachmentsViewMenu" role="option" type="button" tabindex="-1">
<span data-l10n-id="pdfjs-views-manager-attachments-option-label"></span>
</button>
</li>
<li>
<button id="layersViewMenu" role="option" type="button" tabindex="-1">
<span data-l10n-id="pdfjs-views-manager-layers-option-label"></span>
</button>
</li>
<button id="thumbnailsViewMenu" role="option" type="button" tabindex="-1">
<span data-l10n-id="pdfjs-views-manager-pages-option-label"></span>
</button>
<button id="outlinesViewMenu" role="option" type="button" tabindex="-1">
<span data-l10n-id="pdfjs-views-manager-outlines-option-label"></span>
</button>
<button id="attachmentsViewMenu" role="option" type="button" tabindex="-1">
<span data-l10n-id="pdfjs-views-manager-attachments-option-label"></span>
</button>
<button id="layersViewMenu" role="option" type="button" tabindex="-1">
<span data-l10n-id="pdfjs-views-manager-layers-option-label"></span>
</button>
</menu>
</div>
<span id="viewsManagerHeaderLabel" class="viewsManagerLabel" role="heading" aria-level="2"></span>
Expand Down Expand Up @@ -217,26 +209,18 @@
<span data-l10n-id="pdfjs-views-manager-pages-status-action-button-label"></span>
</button>
<menu id="viewsManagerStatusActionOptions" class="popupMenu">
<li>
<button id="viewsManagerStatusActionCopy" class="noIcon" role="menuitem" type="button" tabindex="-1" disabled>
<span data-l10n-id="pdfjs-views-manager-pages-status-copy-button-label"></span>
</button>
</li>
<li>
<button id="viewsManagerStatusActionCut" class="noIcon" role="menuitem" type="button" tabindex="-1" disabled>
<span data-l10n-id="pdfjs-views-manager-pages-status-cut-button-label"></span>
</button>
</li>
<li>
<button id="viewsManagerStatusActionDelete" class="noIcon" role="menuitem" type="button" tabindex="-1" disabled>
<span data-l10n-id="pdfjs-views-manager-pages-status-delete-button-label"></span>
</button>
</li>
<li>
<button id="viewsManagerStatusActionExport" class="noIcon" role="menuitem" type="button" tabindex="-1" disabled>
<span data-l10n-id="pdfjs-views-manager-pages-status-export-selected-button-label"></span>
</button>
</li>
<button id="viewsManagerStatusActionCopy" class="noIcon" role="menuitem" type="button" tabindex="-1" disabled>
<span data-l10n-id="pdfjs-views-manager-pages-status-copy-button-label"></span>
</button>
<button id="viewsManagerStatusActionCut" class="noIcon" role="menuitem" type="button" tabindex="-1" disabled>
<span data-l10n-id="pdfjs-views-manager-pages-status-cut-button-label"></span>
</button>
<button id="viewsManagerStatusActionDelete" class="noIcon" role="menuitem" type="button" tabindex="-1" disabled>
<span data-l10n-id="pdfjs-views-manager-pages-status-delete-button-label"></span>
</button>
<button id="viewsManagerStatusActionExport" class="noIcon" role="menuitem" type="button" tabindex="-1" disabled>
<span data-l10n-id="pdfjs-views-manager-pages-status-export-selected-button-label"></span>
</button>
</menu>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/views_manager.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
min-width: 182px;
z-index: 1;

> li > button {
> button {
&#thumbnailsViewMenu::before {
mask-image: var(--menuitem-thumbnailsView-icon);
}
Expand Down
Loading