From 0983ffbef29e942d09293abb63e903ad3e446694 Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Wed, 6 Jul 2022 10:53:08 -0400
Subject: [PATCH] fx-compat: Make sync / retraction links tabbable

Addresses #2655. Still need to add roles.
---
 chrome/content/zotero/zoteroPane.xhtml | 28 +++++++++++++-------------
 chrome/skin/default/zotero/overlay.css | 11 ++++++----
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 8c4b634753..90adbdc298 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -918,23 +918,23 @@
 							</toolbar>
 		
 							<vbox id="sync-reminder-container" collapsed="true">
-								<div xmlns="http://www.w3.org/1999/xhtml" id="sync-reminder-banner">
-									<div id="sync-reminder-message"/>
-									<a id="sync-reminder-action" class="sync-reminder-link"/>
-									<a id="sync-reminder-learn-more" class="sync-reminder-link"/>
-									<div id="sync-reminder-spacer"/>
-									<a id="sync-reminder-disable" class="sync-reminder-link"/>
-									<a id="sync-reminder-remind" class="sync-reminder-link"/>
-									<div id="sync-reminder-close">×</div>
-								</div>
+								<html:div id="sync-reminder-banner">
+									<html:div id="sync-reminder-message"/>
+									<html:a id="sync-reminder-action" class="sync-reminder-link"/>
+									<html:a id="sync-reminder-learn-more" class="sync-reminder-link"/>
+									<html:div id="sync-reminder-spacer"/>
+									<html:a id="sync-reminder-disable" class="sync-reminder-link"/>
+									<html:a id="sync-reminder-remind" class="sync-reminder-link"/>
+									<label is="text-link" id="sync-reminder-close">×</label>
+								</html:div>
 							</vbox>
 							
 							<vbox id="retracted-items-container" collapsed="true">
-								<div xmlns="http://www.w3.org/1999/xhtml" id="retracted-items-banner">
-									<div id="retracted-items-message"/>
-									<div id="retracted-items-link"/>
-									<div id="retracted-items-close">×</div>
-								</div>
+								<html:div id="retracted-items-banner">
+									<html:div id="retracted-items-message"/>
+									<label is="text-link" id="retracted-items-link"/>
+									<label is="text-link" id="retracted-items-close">×</label>
+								</html:div>
 							</vbox>
 							
 							<popupset id="trees-popupset">
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index cb7e4f50c4..57679f28c2 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -672,15 +672,17 @@
 	flex: 1;
 }
 
+#retracted-items-link, .sync-reminder-link, #retracted-items-close, #sync-reminder-close {
+	color: inherit;
+	border: none;
+	margin: 0;
+}
+
 #retracted-items-link {
-	text-decoration: underline;
 	margin-left: .3em;
-	cursor: pointer;
 }
 
 .sync-reminder-link {
-	text-decoration: underline;
-	cursor: pointer;
 	padding-left: 0.5em;
 	padding-right: 0.5em;
 }
@@ -694,6 +696,7 @@
 }
 
 #retracted-items-close, #sync-reminder-close {
+	text-decoration: none;
 	position: absolute;
 	cursor: pointer;
 	top: -2px;