diff options
45 files changed, 49 insertions, 67 deletions
diff --git a/source/features/action-used-by-link.tsx b/source/features/action-used-by-link.tsx index 6ce3f846..bd8364f8 100644 --- a/source/features/action-used-by-link.tsx +++ b/source/features/action-used-by-link.tsx @@ -19,7 +19,7 @@ function init(): void { select('.d-block.mb-2[href^="/contact"]')!.after( <a href={String(actionURL)} className="d-block mb-2"> - <SearchIcon width={14} className="text-gray-dark color-text-primary mr-2"/>Usage examples + <SearchIcon width={14} className="color-text-primary mr-2"/>Usage examples </a>, ); } diff --git a/source/features/align-issue-labels.css b/source/features/align-issue-labels.css index 5f00bb54..dfeec281 100644 --- a/source/features/align-issue-labels.css +++ b/source/features/align-issue-labels.css @@ -12,7 +12,6 @@ margin-left: 4px; } -.rgh-align-issue-labels .js-issue-row .mt-1.text-small.text-gray, /* GHE #4026 */ .rgh-align-issue-labels .js-issue-row .mt-1.text-small.color-text-secondary { /* Issue details line */ flex-basis: 100%; } diff --git a/source/features/center-reactions-popup.css b/source/features/center-reactions-popup.css index ce0ec31b..a628162b 100644 --- a/source/features/center-reactions-popup.css +++ b/source/features/center-reactions-popup.css @@ -1,5 +1,4 @@ /* Hide reaction popover text */ -.js-add-reaction-popover .text-gray, /* GHE #4021 */ .js-add-reaction-popover .color-text-secondary, .js-add-reaction-popover .dropdown-divider { display: none; @@ -55,5 +54,5 @@ td.js-line-comments:last-child .timeline-comment-actions .add-reaction-popover:: /* Keep colored button when reaction popup is open */ .dropdown-details[open] .timeline-comment-action { opacity: 100%; - color: var(--color-mktg-btn-bg, #4078c0); /* GHE #4121 */ + color: var(--color-mktg-btn-bg, #4078c0); } diff --git a/source/features/clean-conversation-headers.css b/source/features/clean-conversation-headers.css index fc61ef07..3c46052c 100644 --- a/source/features/clean-conversation-headers.css +++ b/source/features/clean-conversation-headers.css @@ -1,7 +1,7 @@ :root .rgh-clean-conversation-headers-non-default-branch { - background-color: var(--color-state-hover-primary-bg, #0366d6); /* GHE #4121 */ + background-color: var(--color-state-hover-primary-bg, #0366d6); } .rgh-clean-conversation-headers-non-default-branch a { - color: var(--color-state-hover-primary-text, #fff); /* GHE #4121 */ + color: var(--color-state-hover-primary-text, #fff); } diff --git a/source/features/clean-dashboard.css b/source/features/clean-dashboard.css index 0a799529..5dc9f395 100644 --- a/source/features/clean-dashboard.css +++ b/source/features/clean-dashboard.css @@ -7,8 +7,6 @@ * `.js-news-feed-event-group` is only for grouped events */ -/* GHE #4021 */ -.rgh-clean-dashboard .dashboard :is(.watch_started, .repo, .public) .color-border-secondary.flex-items-baseline .text-bold.text-gray-dark, /* Hide duplicate repo name in some non-grouped events */ .rgh-clean-dashboard .dashboard :is(.watch_started, .repo, .public) .color-border-secondary.flex-items-baseline .text-bold.color-text-primary { display: none; @@ -52,13 +50,11 @@ } /* Hide footer date on Created Repository events */ -.rgh-clean-dashboard .dashboard .repo .f6.text-gray, /* GHE #4021 */ .rgh-clean-dashboard .dashboard .repo .f6.color-text-secondary { display: none; } /* Grouped events: Make repo name smaller */ -.rgh-clean-dashboard .dashboard .Details .flex-items-baseline .text-bold.text-gray-dark, /* GHE #4021 */ .rgh-clean-dashboard .dashboard .Details .flex-items-baseline .text-bold.color-text-primary { font-size: 1em !important; } diff --git a/source/features/clean-footer.css b/source/features/clean-footer.css index d454b5a2..d3b0ea46 100644 --- a/source/features/clean-footer.css +++ b/source/features/clean-footer.css @@ -16,5 +16,5 @@ body > .footer > div > ul:first-of-type li:first-of-type { /* The `© 2017 GitHu body > .footer li a, body > .footer li .btn-link { - color: var(--color-text-disabled, #666); /* GHE #4121 */ + color: var(--color-text-disabled, #666); } diff --git a/source/features/clean-mergeability-box.css b/source/features/clean-mergeability-box.css index c8f1d6a9..5035fd66 100644 --- a/source/features/clean-mergeability-box.css +++ b/source/features/clean-mergeability-box.css @@ -16,7 +16,6 @@ font-weight: 600; } -.mergeability-details .js-details-container .text-red + .status-meta, /* GHE #4121 */ .mergeability-details .js-details-container .color-text-danger + .status-meta { color: var(--github-red); } diff --git a/source/features/clean-repo-sidebar.tsx b/source/features/clean-repo-sidebar.tsx index 0317e0eb..ca3fab17 100644 --- a/source/features/clean-repo-sidebar.tsx +++ b/source/features/clean-repo-sidebar.tsx @@ -8,7 +8,7 @@ import features from '.'; async function removeReadmeLink(): Promise<void> { // Hide "Readme" link made unnecessary by toggle-files-button #3580 - (await elementReady('.muted-link[href="#readme"], .Link--muted[href="#readme"]'))?.parentElement!.remove(); + (await elementReady('.Link--muted[href="#readme"]'))?.parentElement!.remove(); } async function cleanLicenseText(): Promise<void> { @@ -45,7 +45,7 @@ async function cleanReleases(): Promise<void> { } // Align latest tag icon with the icons of other meta links - const tagIcon = select('.octicon-tag:not(:is(.text-green, .color-text-success))', releasesSection)!; + const tagIcon = select('.octicon-tag:not(.color-text-success)', releasesSection)!; if (tagIcon) { tagIcon.classList.add('mr-2'); // Remove whitespace node diff --git a/source/features/clone-branch.tsx b/source/features/clone-branch.tsx index ab4532bb..fabd24f7 100644 --- a/source/features/clone-branch.tsx +++ b/source/features/clone-branch.tsx @@ -79,7 +79,7 @@ async function init(): Promise<void | false> { <button type="button" aria-label="Clone this branch" - className="link-gray Link--secondary btn-link tooltipped tooltipped-nw ml-3 rgh-clone-branch" + className="Link--secondary btn-link tooltipped tooltipped-nw ml-3 rgh-clone-branch" > <GitBranchIcon/> </button>, diff --git a/source/features/conflict-marker.tsx b/source/features/conflict-marker.tsx index b778c256..7ffccfed 100644 --- a/source/features/conflict-marker.tsx +++ b/source/features/conflict-marker.tsx @@ -60,7 +60,7 @@ async function init(): Promise<false | void> { if (data[pr.key].pullRequest.mergeable === 'CONFLICTING') { pr.link.after( <a - className="rgh-conflict-marker tooltipped tooltipped-e text-gray color-text-secondary ml-2" + className="rgh-conflict-marker tooltipped tooltipped-e color-text-secondary ml-2" aria-label="This PR has conflicts that must be resolved" href={`${pr.link.pathname}#partial-pull-merging`} > diff --git a/source/features/conversation-links-on-repo-lists.tsx b/source/features/conversation-links-on-repo-lists.tsx index a6cd79f8..285cb2fa 100644 --- a/source/features/conversation-links-on-repo-lists.tsx +++ b/source/features/conversation-links-on-repo-lists.tsx @@ -23,13 +23,13 @@ function init(): void { // Place before the "Updated on" element select('relative-time', repository)!.previousSibling!.before( <a - className="muted-link Link--muted mr-3" + className="Link--muted mr-3" href={repositoryLink.href + '/issues?q=is%3Aissue+is%3Aopen'} > <IssueOpenedIcon/> </a>, <a - className="muted-link Link--muted mr-3" + className="Link--muted mr-3" href={repositoryLink.href + '/pulls?q=is%3Apr+is%3Aopen'} > <GitPullRequestIcon/> diff --git a/source/features/convert-pr-to-draft-improvements.tsx b/source/features/convert-pr-to-draft-improvements.tsx index 1a70058f..fe73b8bc 100644 --- a/source/features/convert-pr-to-draft-improvements.tsx +++ b/source/features/convert-pr-to-draft-improvements.tsx @@ -28,7 +28,7 @@ function init(): void { alternativeActions.classList.add('rgh-convert-pr-draft-position'); const convertToDraft = existingButton.closest('details')!.cloneNode(true); - select('.muted-link, .Link--muted', convertToDraft)!.classList.remove('muted-link', 'Link--muted'); + select('.Link--muted', convertToDraft)!.classList.remove('Link--muted'); alternativeActions.prepend(convertToDraft); }, }); diff --git a/source/features/deep-reblame.css b/source/features/deep-reblame.css index 8626bfb4..7d9977cd 100644 --- a/source/features/deep-reblame.css +++ b/source/features/deep-reblame.css @@ -1,9 +1,9 @@ button.rgh-deep-reblame .octicon-versions { - color: var(--color-scale-pink-5, #e40de4); /* GHE #4121 */ + color: var(--color-scale-pink-5, #e40de4); opacity: 70%; } .rgh-deep-reblame:hover .octicon-versions { - color: var(--color-scale-pink-7, #800080); /* GHE #4121 */ + color: var(--color-scale-pink-7, #800080); opacity: 70%; } diff --git a/source/features/easier-pr-sha-copy.css b/source/features/easier-pr-sha-copy.css index 3102f46b..23941318 100644 --- a/source/features/easier-pr-sha-copy.css +++ b/source/features/easier-pr-sha-copy.css @@ -1,5 +1,4 @@ /* Add margin to commit SHA to reduce likelihood of selection overflow #2508 */ -.repository-content .js-commit .text-right code .link-gray, /* GHE #4021 */ .repository-content .js-commit .text-right code .Link--secondary { margin-right: 16px; } diff --git a/source/features/extend-diff-expander.css b/source/features/extend-diff-expander.css index 1f564eca..44689cae 100644 --- a/source/features/extend-diff-expander.css +++ b/source/features/extend-diff-expander.css @@ -1,8 +1,8 @@ /* Hovering the line will highlight the first direction button, unless you hover the buttons directly */ .js-expandable-line:hover .blob-num:not(:hover) .directional-expander:first-child, .js-expandable-line:hover .blob-num:not(:hover) + .blob-code { - color: var(--color-state-hover-primary-text, #fff); /* GHE #4121 */ - background: var(--color-state-hover-primary-bg, #0366d6); /* GHE #4121 */ - border-color: var(--color-state-hover-primary-border, #0366d6); /* GHE #4121 */ + color: var(--color-state-hover-primary-text, #fff); + background: var(--color-state-hover-primary-bg, #0366d6); + border-color: var(--color-state-hover-primary-border, #0366d6); cursor: pointer; } diff --git a/source/features/first-published-tag-for-merged-pr.tsx b/source/features/first-published-tag-for-merged-pr.tsx index 851ac5e5..b21ad6c6 100644 --- a/source/features/first-published-tag-for-merged-pr.tsx +++ b/source/features/first-published-tag-for-merged-pr.tsx @@ -34,7 +34,7 @@ async function init(): Promise<void> { discussionHeader.parentElement!.append( ' • ', - <TagIcon className="mx-1 text-gray color-text-secondary"/>, + <TagIcon className="mx-1 color-text-secondary"/>, <a href={buildRepoURL('releases/tag', tagName)} className="commit-ref" diff --git a/source/features/git-checkout-pr.tsx b/source/features/git-checkout-pr.tsx index 46400daf..d06a4228 100644 --- a/source/features/git-checkout-pr.tsx +++ b/source/features/git-checkout-pr.tsx @@ -36,7 +36,7 @@ function checkoutOption(remote?: string, remoteType?: 'HTTPS' | 'SSH'): JSX.Elem const [owner] = nameWithOwner.split('/'); return ( <div className="markdown-body"> - {remote && <p className="text-gray color-text-secondary text-small my-1">{remoteType}</p>} + {remote && <p className="color-text-secondary text-small my-1">{remoteType}</p>} <div className="snippet-clipboard-content position-relative"> <div className="zeroclipboard-container position-absolute right-0 top-0"> <clipboard-copy @@ -78,7 +78,7 @@ async function handleMenuOpening({delegateTarget: dropdown}: delegate.Event): Pr Checkout with Git </span> <div className="mt-2 pl-5"> - <p className="text-gray color-text-secondary text-small"> + <p className="color-text-secondary text-small"> Run in your project repository{remoteName && ', pick either one'} </p> {remoteName ? [ diff --git a/source/features/hide-low-quality-comments.css b/source/features/hide-low-quality-comments.css index 5bf7419d..6b46e30a 100644 --- a/source/features/hide-low-quality-comments.css +++ b/source/features/hide-low-quality-comments.css @@ -1,7 +1,7 @@ .rgh-low-quality-comments-note { margin: 15px 0 10px 60px; font-size: 12px; - color: var(--color-text-secondary, #586069); /* GHE #4121 */ + color: var(--color-text-secondary, #586069); } .rgh-hidden-comment .timeline-comment { diff --git a/source/features/highest-rated-comment.tsx b/source/features/highest-rated-comment.tsx index ae82ef9c..ff8a9797 100644 --- a/source/features/highest-rated-comment.tsx +++ b/source/features/highest-rated-comment.tsx @@ -79,7 +79,7 @@ function linkBestComment(bestComment: HTMLElement): void { <ArrowDownIcon/> </span> - <span className="text-gray color-text-secondary timeline-comment-header-text"> + <span className="color-text-secondary timeline-comment-header-text"> Highest-rated comment: <em>{text}</em> </span> </a> diff --git a/source/features/highlight-deleted-and-added-files-in-diffs.tsx b/source/features/highlight-deleted-and-added-files-in-diffs.tsx index 759d6454..4f97af35 100644 --- a/source/features/highlight-deleted-and-added-files-in-diffs.tsx +++ b/source/features/highlight-deleted-and-added-files-in-diffs.tsx @@ -43,9 +43,9 @@ async function init(): Promise<void | false> { const icon = sourceIcon.cloneNode(true); const action = icon.getAttribute('title')!; if (action === 'added') { - icon.classList.add('text-green', 'color-text-success'); + icon.classList.add('color-text-success'); } else if (action === 'removed') { - icon.classList.add('text-red', 'color-text-danger'); + icon.classList.add('color-text-danger'); } else { return; } diff --git a/source/features/highlight-non-default-base-branch.tsx b/source/features/highlight-non-default-base-branch.tsx index 860bc224..edde3d57 100644 --- a/source/features/highlight-non-default-base-branch.tsx +++ b/source/features/highlight-non-default-base-branch.tsx @@ -56,7 +56,7 @@ async function init(): Promise<false | void> { const branch = pr.baseRef && buildRepoURL(`tree/${pr.baseRefName}`); - prLink.parentElement!.querySelector(':is(.text-small.color-text-secondary, .text-small.text-gray) .d-none.d-md-inline-flex')!.append( + prLink.parentElement!.querySelector('.text-small.color-text-secondary .d-none.d-md-inline-flex')!.append( <span className="issue-meta-section ml-2"> <GitPullRequestIcon/> {' To '} diff --git a/source/features/link-to-changelog-file.tsx b/source/features/link-to-changelog-file.tsx index 3eec454b..db3c4f98 100644 --- a/source/features/link-to-changelog-file.tsx +++ b/source/features/link-to-changelog-file.tsx @@ -67,7 +67,7 @@ async function init(): Promise<void | false> { style={{padding: '6px 16px'}} role="button" > - <BookIcon className="text-blue color-text-link mr-2"/> + <BookIcon className="color-text-link mr-2"/> <span>Changelog</span> </a>, ); diff --git a/source/features/linkify-user-edit-history-popup.tsx b/source/features/linkify-user-edit-history-popup.tsx index 61f249e1..61855a39 100644 --- a/source/features/linkify-user-edit-history-popup.tsx +++ b/source/features/linkify-user-edit-history-popup.tsx @@ -12,7 +12,7 @@ function init(): void { add(avatar) { const userName = avatar.alt.slice(1); // Linkify name first - wrap(avatar.nextElementSibling!, <a className="link-gray-dark Link--primary" href={`/${userName}`}/>); + wrap(avatar.nextElementSibling!, <a className="Link--primary" href={`/${userName}`}/>); // Then linkify avatar wrap(avatar, <a href={`/${userName}`}/>); diff --git a/source/features/list-pr-for-branch.tsx b/source/features/list-pr-for-branch.tsx index e63612ef..828d0439 100644 --- a/source/features/list-pr-for-branch.tsx +++ b/source/features/list-pr-for-branch.tsx @@ -9,9 +9,9 @@ import {getPullRequestsAssociatedWithBranch, stateIcon} from './show-associated- // Taken from https://github.com/fregante/github-issue-link-status/blob/98792f2837352bacbf80664f3edbcec8e579ed17/source/github-issue-link-status.js#L10 const stateColorMap = { - OPEN: 'text-green color-text-success', - CLOSED: 'text-red color-text-danger', - MERGED: 'text-purple color-purple-5', + OPEN: 'color-text-success', + CLOSED: 'color-text-danger', + MERGED: 'color-purple-5', DRAFT: '', }; diff --git a/source/features/mark-merge-commits-in-list.css b/source/features/mark-merge-commits-in-list.css index 50f8010e..03fe7944 100644 --- a/source/features/mark-merge-commits-in-list.css +++ b/source/features/mark-merge-commits-in-list.css @@ -3,6 +3,6 @@ } .rgh-merge-commit .octicon-git-pull-request { - color: var(--color-icon-info, #4078c0); /* GHE #4121 */ + color: var(--color-icon-info, #4078c0); width: 20px; } diff --git a/source/features/parse-backticks.tsx b/source/features/parse-backticks.tsx index 830aa0ce..35d8eabe 100644 --- a/source/features/parse-backticks.tsx +++ b/source/features/parse-backticks.tsx @@ -13,17 +13,13 @@ function init(): void { '.js-commit-group pre', // `isPRConversation` commit description '.release-header', // `isReleasesOrTags` Headers '.Box-row .mb-1 a', // `isCompare` with existing PR - '#pull-requests a.link-gray-dark', // `isPulse` issue and PR title (GHE #4021) '#pull-requests a.Link--primary', // `isPulse` issue and PR title - '[id^="check_suite"] a.link-gray-dark', // `isRepositoryActions` (GHE #4021) '[id^="check_suite"] a.Link--primary', // `isRepositoryActions` '.js-socket-channel[data-url*="/header_partial"] h3', // `isActions` run '.js-wiki-sidebar-toggle-display a', // `isWiki` sidebar pages title '#wiki-wrapper .gh-header-title', // `isWiki` page title - '.issues_labeled .text-gray-dark > a', // `isDashboard` "help wanted" event titles (GHE #4021) '.issues_labeled .color-text-primary > a', // `isDashboard` "help wanted" event titles '#user-repositories-list [itemprop="description"]', // `isUserProfileRepoTab` repository description - '.js-hovercard-content > .Popover-message .link-gray-dark', // Hovercard (GHE #4021) '.js-hovercard-content > .Popover-message .Link--primary', // Hovercard '.js-discussions-title-container h1 > .js-issue-title', // `isDiscussion` 'a[data-hovercard-type="discussion"]', // `isDiscussionList` diff --git a/source/features/pinned-issues-update-time.tsx b/source/features/pinned-issues-update-time.tsx index 61fd7cf9..3eb48fe6 100644 --- a/source/features/pinned-issues-update-time.tsx +++ b/source/features/pinned-issues-update-time.tsx @@ -45,7 +45,7 @@ async function init(): Promise<void | false> { const {updatedAt} = lastUpdated[api.escapeKey(issueNumber)]; select('.pinned-item-desc', pinnedIssue)!.append( ' • ', - <span className="text-gray color-text-secondary d-inline-block"> + <span className="color-text-secondary d-inline-block"> updated <relative-time datetime={updatedAt}/> </span>, ); diff --git a/source/features/pr-approvals-count.css b/source/features/pr-approvals-count.css index 8cbe7b3e..7e648fdd 100644 --- a/source/features/pr-approvals-count.css +++ b/source/features/pr-approvals-count.css @@ -1,10 +1,8 @@ /* Show approvals count in PR list */ -.js-issue-row .text-gray [href$='#partial-pull-merging'][aria-label*='approval'], /* GHE #4021 */ .js-issue-row .color-text-secondary [href$='#partial-pull-merging'][aria-label*='approval'] { font-size: 0; } -.js-issue-row .text-gray [href$='#partial-pull-merging'][aria-label*='approval']::before, /* GHE #4021 */ .js-issue-row .color-text-secondary [href$='#partial-pull-merging'][aria-label*='approval']::before { all: unset; content: attr(aria-label); @@ -13,7 +11,6 @@ font-size: 12px; } -.js-issue-row .text-gray [href$='#partial-pull-merging'][aria-label*='changes'], /* GHE #4021 */ .js-issue-row .color-text-secondary [href$='#partial-pull-merging'][aria-label*='changes'] { color: var(--github-red) !important; } diff --git a/source/features/pr-commit-lines-changed.tsx b/source/features/pr-commit-lines-changed.tsx index 5a9efa5f..99dbbef2 100644 --- a/source/features/pr-commit-lines-changed.tsx +++ b/source/features/pr-commit-lines-changed.tsx @@ -31,8 +31,8 @@ async function init(): Promise<void> { const diffstat = await elementReady('.diffstat', {waitForChildren: false}); diffstat!.replaceWith( <span className="ml-2 diffstat tooltipped tooltipped-s" aria-label={tooltip}> - <span className="text-green color-text-success">+{additions}</span>{' '} - <span className="text-red color-text-danger">−{deletions}</span>{' '} + <span className="color-text-success">+{additions}</span>{' '} + <span className="color-text-danger">−{deletions}</span>{' '} <span className="diffstat-block-neutral"/> <span className="diffstat-block-neutral"/> <span className="diffstat-block-neutral"/> diff --git a/source/features/quick-comment-hiding.tsx b/source/features/quick-comment-hiding.tsx index 438be81f..8ffd6bb2 100644 --- a/source/features/quick-comment-hiding.tsx +++ b/source/features/quick-comment-hiding.tsx @@ -39,7 +39,7 @@ function generateSubmenu(hideButton: Element): void { select('[name="classifier"]', hideCommentForm)!.remove(); // Imitate existing menu - hideCommentForm.classList.add('dropdown-menu', 'dropdown-menu-sw', 'text-gray-dark', 'color-text-primary', 'show-more-popover', 'anim-scale-in'); + hideCommentForm.classList.add('dropdown-menu', 'dropdown-menu-sw', 'color-text-primary', 'show-more-popover', 'anim-scale-in'); detailsElement.append(hideCommentForm); } diff --git a/source/features/quick-pr-diff-options.tsx b/source/features/quick-pr-diff-options.tsx index d4a240bb..2bfd781c 100644 --- a/source/features/quick-pr-diff-options.tsx +++ b/source/features/quick-pr-diff-options.tsx @@ -55,7 +55,7 @@ function createWhitespaceButton(): HTMLElement { const classes = pageDetect.isPR() ? 'tooltipped tooltipped-s d-none d-lg-block color-icon-secondary ' + (isHidingWhitespace ? '' : 'color-icon-info') - : 'tooltipped tooltipped-s btn btn-sm tooltipped ' + (isHidingWhitespace ? 'bg-gray-light text-gray-light color-text-tertiary' : ''); + : 'tooltipped tooltipped-s btn btn-sm tooltipped ' + (isHidingWhitespace ? 'bg-gray-light color-text-tertiary' : ''); return ( <a diff --git a/source/features/quick-review.tsx b/source/features/quick-review.tsx index 7cc4e23c..a7cb91a4 100644 --- a/source/features/quick-review.tsx +++ b/source/features/quick-review.tsx @@ -19,7 +19,7 @@ async function addSidebarReviewButton(): Promise<void | false> { sidebarReviewsSection!.append( <span style={{fontWeight: 'normal'}}> - – <a href={reviewFormUrl.href} className="btn-link muted-link Link--muted" data-hotkey="v">review now</a> + – <a href={reviewFormUrl.href} className="btn-link Link--muted" data-hotkey="v">review now</a> </span>, ); } diff --git a/source/features/release-download-count.tsx b/source/features/release-download-count.tsx index 9d988408..92f02c73 100644 --- a/source/features/release-download-count.tsx +++ b/source/features/release-download-count.tsx @@ -65,7 +65,7 @@ async function init(): Promise<void | false> { // Match the asset in the DOM to the asset in the API response for (const [index, {name, downloadCount}] of sortedDownloads.entries()) { if (name === assetName.textContent && downloadCount > 0) { - const classes = 'rgh-release-download-count mr-2 text-gray color-text-secondary' + (index === 0 ? ' text-bold' : ''); + const classes = 'rgh-release-download-count mr-2 color-text-secondary' + (index === 0 ? ' text-bold' : ''); // Place next to asset size assetName .closest('.Box-body')! diff --git a/source/features/repo-age.tsx b/source/features/repo-age.tsx index 7a0978f7..f730498d 100644 --- a/source/features/repo-age.tsx +++ b/source/features/repo-age.tsx @@ -114,7 +114,7 @@ async function init(): Promise<void> { sidebarAboutSection!.append( <h3 className="sr-only">Repository age</h3>, <div className="mt-3"> - <a href={firstCommitHref} className="muted-link Link--muted" title={`First commit dated ${dateFormatter.format(birthday)}`}> + <a href={firstCommitHref} className="Link--muted" title={`First commit dated ${dateFormatter.format(birthday)}`}> <RepoIcon className="mr-2"/>{age} </a> </div>, diff --git a/source/features/submit-review-as-single-comment.tsx b/source/features/submit-review-as-single-comment.tsx index a1183a60..d77e1542 100644 --- a/source/features/submit-review-as-single-comment.tsx +++ b/source/features/submit-review-as-single-comment.tsx @@ -12,7 +12,7 @@ import features from '.'; const pendingSelector = '.timeline-comment-label.is-pending'; const getButton = onetime(() => ( - <button className="rgh-submit-single btn-link ml-2 text-gray color-text-secondary text-small" type="button">Send now</button> + <button className="rgh-submit-single btn-link ml-2 color-text-secondary text-small" type="button">Send now</button> )); function updateUI(): void { diff --git a/source/features/sync-pr-commit-title.tsx b/source/features/sync-pr-commit-title.tsx index a324aaa6..66ce767d 100644 --- a/source/features/sync-pr-commit-title.tsx +++ b/source/features/sync-pr-commit-title.tsx @@ -40,7 +40,7 @@ function needsSubmission(): boolean { function getUI(): HTMLElement { return select(`${mergeFormSelector} .rgh-sync-pr-commit-title-note`) ?? ( <p className="note rgh-sync-pr-commit-title-note"> - The title of this PR will be updated to match this title. <button type="button" className="btn-link muted-link Link--muted text-underline rgh-sync-pr-commit-title">Cancel</button> + The title of this PR will be updated to match this title. <button type="button" className="btn-link Link--muted text-underline rgh-sync-pr-commit-title">Cancel</button> </p> ); } diff --git a/source/features/table-input.css b/source/features/table-input.css index 730994b7..191b783b 100644 --- a/source/features/table-input.css +++ b/source/features/table-input.css @@ -19,5 +19,5 @@ .rgh-table-input:hover .selected div { border-color: #79b8ff; - background-color: var(--color-diff-blob-hunk-num-bg, #dbedff); /* GHE #4121 */ + background-color: var(--color-diff-blob-hunk-num-bg, #dbedff); } diff --git a/source/features/tag-changelog-link.tsx b/source/features/tag-changelog-link.tsx index c67642a8..ae8e9152 100644 --- a/source/features/tag-changelog-link.tsx +++ b/source/features/tag-changelog-link.tsx @@ -105,7 +105,7 @@ async function init(): Promise<void> { lastLink.after( <li className={lastLink.className + ' rgh-changelog-link'}> <a - className="muted-link Link--muted tooltipped tooltipped-n" + className="Link--muted tooltipped tooltipped-n" aria-label={'See changes since ' + decodeURIComponent(previousTag)} href={buildRepoURL(`compare/${previousTag}...${allTags[index].tag}`)} > diff --git a/source/features/update-pr-from-base-branch.tsx b/source/features/update-pr-from-base-branch.tsx index 70cfc6ea..74db2314 100644 --- a/source/features/update-pr-from-base-branch.tsx +++ b/source/features/update-pr-from-base-branch.tsx @@ -10,7 +10,7 @@ import features from '.'; import * as api from '../github-helpers/api'; import {getConversationNumber} from '../github-helpers'; -const selectorForPushablePRNotice = '.merge-pr > .color-text-secondary:first-child:not(.rgh-update-pr), .merge-pr > .text-gray:first-child:not(.rgh-update-pr)'; +const selectorForPushablePRNotice = '.merge-pr > .color-text-secondary:first-child:not(.rgh-update-pr)'; let observer: Observer; function getBranches(): {base: string; head: string} { diff --git a/source/features/useful-not-found-page.tsx b/source/features/useful-not-found-page.tsx index fddc3917..a48800e5 100644 --- a/source/features/useful-not-found-page.tsx +++ b/source/features/useful-not-found-page.tsx @@ -21,7 +21,7 @@ async function is404(url: string): Promise<boolean> { } function getStrikeThrough(text: string): HTMLElement { - return <del className="color-text-tertiary">{text}</del>; /* GHE #4121 */ + return <del className="color-text-tertiary">{text}</del>; } async function checkAnchor(anchor: HTMLAnchorElement): Promise<void> { diff --git a/source/features/user-local-time.tsx b/source/features/user-local-time.tsx index 10cd9c1e..44be5fba 100644 --- a/source/features/user-local-time.tsx +++ b/source/features/user-local-time.tsx @@ -101,7 +101,7 @@ async function insertUserLocalTime(hovercardContainer: Element): Promise<void> { const placeholder = <span>Guessing local time…</span>; const container = ( - <div className="mt-2 text-gray color-text-secondary text-small"> + <div className="mt-2 color-text-secondary text-small"> <ClockIcon/> {placeholder} </div> ); diff --git a/source/features/user-profile-follower-badge.tsx b/source/features/user-profile-follower-badge.tsx index 6bee4e22..98cb4410 100644 --- a/source/features/user-profile-follower-badge.tsx +++ b/source/features/user-profile-follower-badge.tsx @@ -22,7 +22,7 @@ const doesUserFollow = cache.function(async (userA: string, userB: string): Prom async function init(): Promise<void> { if (await doesUserFollow(getCleanPathname(), getUsername()!)) { select('.js-profile-editable-area .octicon-star')!.closest('mb-3')!.append( - <span className="text-gray color-text-secondary"> · Follows you</span>, + <span className="color-text-secondary"> · Follows you</span>, ); } } diff --git a/source/features/wait-for-build.css b/source/features/wait-for-build.css index 10b99aa7..47bbbaba 100644 --- a/source/features/wait-for-build.css +++ b/source/features/wait-for-build.css @@ -1,5 +1,5 @@ /* Visibly disable merge fields during submission */ [name='commit_message'][disabled], [name='commit_title'][disabled] { - color: var(--color-text-disabled, #808080); /* GHE #4121 */ + color: var(--color-text-disabled, #808080); } diff --git a/source/options-storage.ts b/source/options-storage.ts index 86a5c1ec..f18a2b13 100644 --- a/source/options-storage.ts +++ b/source/options-storage.ts @@ -18,7 +18,6 @@ const defaults = Object.assign({ logHTTP: false, }, Object.fromEntries(__features__.map(id => [`feature:${id}`, true]))); -// TODO[2021-10-01]: Drop classes `muted-link`, `link-gray`, `link-gray-dark`, `text-gray`, `text-gray-light`, `text-gray-dark`, `text-green`, `text-red` `text-blue` #4021 const migrations = [ featureWasRenamed('separate-draft-pr-button', 'one-click-pr-or-gist'), // Merged in May featureWasRenamed('prevent-pr-commit-link-loss', 'prevent-link-loss'), // Merged in May diff --git a/source/refined-github.css b/source/refined-github.css index 5b86dfd5..43f3eeb3 100644 --- a/source/refined-github.css +++ b/source/refined-github.css @@ -71,7 +71,7 @@ /* Lighten deletions in Markdown */ .markdown-body del { - color: var(--color-text-tertiary, #6a737d); /* GHE #4121 */ + color: var(--color-text-tertiary, #6a737d); } /* Expand PR merge status list to fit all items */ @@ -116,13 +116,11 @@ highlight-collaborators-and-own-conversations parse-backticks pr-branches */ -.js-issue-row .text-small.text-gray, /* GHE #4021 */ .js-issue-row .text-small.color-text-secondary { line-height: 1.8; } /* Reset `vertical-align` for .octicons to work with above increased line-height */ -.js-issue-row .text-small.text-gray .octicon, /* GHE #4021 */ .js-issue-row .text-small.color-text-secondary .octicon { vertical-align: middle; } |