Skip to content

Unify and improve cancellation buttons #696

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

Open
gibson042 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Unify and improve cancellation buttons #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67d4662
make unpin buttons less rigid about event.target
gibson042 May 3, 2026
8ed4586
unify structure and styles for cancellation buttons
gibson042 May 3, 2026
2bcc7ac
use the actual cancellation character for cancellation buttons
gibson042 May 3, 2026
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
56 changes: 34 additions & 22 deletions css/elements.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
--control-dialog-fade-color: rgba(255, 255, 255, 0.6);

--control-link-foreground-color: #1567a2;
--control-danger-foreground-color: #bb1212;

--control-input-background-color: #bbb;
--control-input-border-color: #999;

--menu-header-background-color: #bbb;
--menu-revealed-link-foreground-color: #206ca7;
--menu-unpin-hover-foreground-color: #bb1212;

--menu-trace-list-foreground-color: #999;
--menu-trace-list-background-color: #222;
Expand Down Expand Up @@ -140,13 +140,13 @@
--control-dialog-fade-color: rgba(0, 0, 0, 0.6);

--control-link-foreground-color: #7ebce9;
--control-danger-foreground-color: #f29c9c;

--control-input-background-color: #606060;
--control-input-border-color: #a0a0a0;

--menu-header-background-color: #404040;
--menu-revealed-link-foreground-color: #9bd0f7;
--menu-unpin-hover-foreground-color: #f29c9c;

--menu-trace-list-foreground-color: #222;
--menu-trace-list-background-color: #999;
Expand Down Expand Up @@ -258,6 +258,14 @@
src: local(IBM Plex Mono Bold Italic), local(IBMPlexMono-BoldItalic);
}

/* Generic classes */

.cancellation-button::after {
content: '\1F5D9';
}

/* Elements */

html {
background-color: var(--background-color);
}
Expand Down Expand Up @@ -1141,8 +1149,15 @@ tr.del > td {
display: block;
}

#menu-pins .unpin-all {
#menu-pins button {
border: none;
background: transparent;
color: var(--foreground-color);

cursor: pointer;
}

#menu-pins .unpin-all {
background: var(--control-dark-background-color);
border-radius: 4px;
height: 18px;
Expand All @@ -1152,6 +1167,7 @@ tr.del > td {
}
#menu-pins .unpin-all:hover {
background: var(--control-background-color);
color: var(--control-danger-foreground-color);
}

#menu-pins-list {
Expand Down Expand Up @@ -1180,29 +1196,17 @@ tr.del > td {
text-align: center;
padding: 1px 3px;
border-radius: 4px;
background: none;
border: none;
}
#menu-pins-list > li::before,
#menu-pins-list > li > .unpin:hover {
background: var(--control-dark-background-color);
}

#menu-pins-list > li > .unpin,
#menu-pins .unpin-all {
cursor: pointer;
color: var(--foreground-color);
}
#menu-pins-list > li > .unpin:hover,
#menu-pins .unpin-all:hover {
color: var(--menu-unpin-hover-foreground-color);
}

#menu-pins-list > li::before {
background: var(--control-dark-background-color);
content: counter(pins-counter);
counter-increment: pins-counter;
font-size: 16px;
}
#menu-pins-list > li > .unpin:hover {
background: var(--control-dark-background-color);
color: var(--control-danger-foreground-color);
}

#menu-toc > ol {
padding: 0;
Expand Down Expand Up @@ -1580,18 +1584,26 @@ li.menu-search-result-term::before {
}

#references-pane > .menu-pane-header {
padding-right: 2px;
cursor: row-resize;
}

#references-pane-container.active {
display: flex;
}

#references-pane-close::after {
content: '\2716';
#references-pane-close {
float: right;

border: none;
background: transparent;
color: var(--foreground-color);

cursor: pointer;
}
#references-pane-close:hover {
background: var(--control-dark-background-color);
}

#references-pane table tbody {
vertical-align: baseline;
Expand Down
8 changes: 5 additions & 3 deletions js/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ Menu.prototype.addPinEntry = function (id) {
}

let link = `<a href="${makeLinkToId(entry.id)}">${text}</a>`;
this.$pinList.innerHTML += `<li data-section-id="${id}">${link}<button class="unpin">\u{2716}</button></li>`;
this.$pinList.innerHTML += `<li data-section-id="${id}">${link}<button class="cancellation-button unpin"></button></li>`;

if (Object.keys(this._pinnedIds).length === 0) {
this.showPins();
Expand All @@ -536,7 +536,8 @@ Menu.prototype.unpinAll = function () {
};

Menu.prototype.pinListClick = function (event) {
if (event?.target?.classList.contains('unpin')) {
let target = event?.target?.closest('.unpin');
if (target && event.currentTarget?.contains(target)) {
let id = event.target.parentNode.dataset.sectionId;
if (id) {
this.removePinEntry(id);
Expand Down Expand Up @@ -762,8 +763,9 @@ let referencePane = {
this.dragStart(e);
});

this.$closeButton = document.createElement('span');
this.$closeButton = document.createElement('button');
this.$closeButton.setAttribute('id', 'references-pane-close');
this.$closeButton.classList.add('cancellation-button');
this.$closeButton.addEventListener('click', () => {
this.deactivate();
});
Expand Down
Loading