Bug 1755184 - Remove macOS-specific --focus-ring-box-shadow. r=Itiel

Differential Revision: https://phabricator.services.mozilla.com/D138624

browser/themes/linux/places/sidebar.css

@@ -19,10 +19,6 @@
   margin-inline-start: 4px;
 }
 
-#viewButton:-moz-focusring:not(:hover, [open]) {
-  outline: 1px dotted -moz-DialogText;
-}
-
 :root[uidensity=touch] #search-box,
 :root[uidensity=touch] .sidebar-placesTreechildren::-moz-tree-row {
   min-height: 32px;

browser/themes/osx/customizableui/panelUI.css

@@ -88,6 +88,6 @@ menu.subviewbutton > .menu-right {
   background-color: var(--panel-item-active-bgcolor);
 }
 
-.panel-button:-moz-focusring {
-  box-shadow: var(--focus-ring-box-shadow);
+.panel-button:focus-visible {
+  outline: var(--focus-outline);
 }

browser/themes/osx/places/sidebar.css

@@ -49,7 +49,3 @@
   /* Default font size is 11px on mac, so this is 12px */
   font-size: 1.0909rem;
 }
-
-#viewButton:focus {
-  box-shadow: var(--focus-ring-box-shadow);
-}

browser/themes/shared/places/sidebar.inc.css

@@ -65,11 +65,17 @@
 }
 
 #viewButton:hover {
-  background-color: hsla(240, 5%, 5%, .1);
+  /* Matches --toolbarbutton-hover-background: */
+  background-color: color-mix(in srgb, currentColor 17%, transparent);
 }
 
 #viewButton[open] {
-  background-color: hsla(240, 5%, 5%, .15);
+  /* Matches --toolbarbutton-active-background: */
+  background-color: color-mix(in srgb, currentColor 30%, transparent);
+}
+
+#viewButton:focus-visible {
+  outline: var(--focus-outline);
 }
 
 #viewButton > .button-box > .button-menu-dropmarker {

browser/themes/shared/sidebar.inc.css

@@ -76,23 +76,19 @@
   padding: 2px 4px;
 }
 
-#sidebar-switcher-target:-moz-focusring:not(:hover, [open]),
-#sidebar-close:-moz-focusring:not(:hover, [open]) {
-  outline: var(--default-focusring);
+#sidebar-switcher-target:hover {
+  background-color: var(--toolbarbutton-hover-background);
 }
 
 #sidebar-switcher-target:hover:active,
 #sidebar-switcher-target.active {
-  background: var(--toolbarbutton-active-background);
+  background-color: var(--toolbarbutton-active-background);
 }
 
-/* Ensure we do not lose contrast between lightweight and OS theme colours */
-#sidebar-switcher-target:hover:-moz-lwtheme {
-  background: hsla(240, 5%, 5%, 0.1);
-}
-#sidebar-switcher-target:hover:active:-moz-lwtheme,
-#sidebar-switcher-target.active:-moz-lwtheme {
-  background: hsla(240, 5%, 5%, 0.15);
+#sidebar-switcher-target:focus-visible,
+#sidebar-close:focus-visible {
+  outline: var(--focus-outline);
+  outline-offset: 0;
 }
 
 #sidebarMenu-popup .subviewbutton {

toolkit/themes/osx/global/global.css

@@ -8,7 +8,6 @@
   /* ::::: Variables ::::: */
   --panel-description-color: hsl(0,0%,50%);
 
-  --focus-ring-box-shadow: 0 0 0 1px -moz-mac-focusring inset, 0 0 0 1px -moz-mac-focusring;
   --focus-outline-color: -moz-mac-focusring;
 
   /* ::::: Styles ::::: */
@@ -77,8 +76,8 @@ xul|separator.groove[orient="vertical"] {
 
 /* Link focus outline */
 
-.text-link:-moz-focusring {
-  box-shadow: var(--focus-ring-box-shadow);
+.text-link:focus-visible {
+  outline: var(--focus-outline);
 }
 
 /* Input margins */

toolkit/themes/osx/global/tabprompts.css

@@ -58,6 +58,6 @@ tabmodalprompt {
               0 1px 3px hsla(0,0%,0%,.2);
 }
 
-.tabmodalprompt-buttonContainer > button:focus {
-  box-shadow: var(--focus-ring-box-shadow)
+.tabmodalprompt-buttonContainer > button:focus-visible {
+  outline: var(--focus-outline);
 }

toolkit/themes/osx/global/tree.css

@@ -14,11 +14,3 @@
     outline: none;
   }
 }
-
-/* ::::: editable tree ::::: */
-
-html|input.tree-input {
-  appearance: none;
-  border-width: 0;
-  box-shadow: var(--focus-ring-box-shadow);
-}

toolkit/themes/shared/tree.inc.css

@@ -216,9 +216,11 @@ html|input.tree-input {
   left: 0;
   appearance: none;
   -moz-box-flex: 1;
-  border: 1px solid SelectedItem;
-  margin: 0;
-  margin-inline-start: -4px;
+  border: 0;
+  border-radius: 2px;
+  outline: var(--focus-outline);
+  margin-block: -1px 0;
+  margin-inline: -2px 0;
   padding: 1px;
   font: inherit;
 }