Backed out changeset 57d19e70e34c (bug 1794142) for causing mochitest…

… failures in browser_parsable_css.js CLOSED TREE
dothq · Nov 16, 2022 · 52cb727 · 52cb727
1 parent a01e4b7
commit 52cb727
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 235 deletions.
diff --git a/browser/components/screenshots/content/cancel.svg b/browser/components/screenshots/content/cancel.svg
diff --git a/browser/components/screenshots/content/copy.svg b/browser/components/screenshots/content/copy.svg
diff --git a/browser/components/screenshots/content/download.svg b/browser/components/screenshots/content/download.svg
diff --git a/browser/components/screenshots/content/screenshots.css b/browser/components/screenshots/content/screenshots.css
@@ -33,11 +33,6 @@ body {
   white-space: nowrap;
 }
 
-button img {
-  -moz-context-properties: fill;
-  fill: currentColor;
-}
-
 .button.hidden,
 .hidden.preview-button {
   display: none;
@@ -55,13 +50,6 @@ button img {
   background-color: #dedede;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.active,
-  .active.preview-button {
-    background-color: ButtonFace;
-  }
-}
-
 .button.tiny,
 .tiny.preview-button {
   font-size: 14px;
@@ -83,25 +71,6 @@ button img {
   border-color: #989898;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.tiny,
-  .tiny.preview-button {
-    border-color: ButtonBorder;
-  }
-
-  .button.tiny:hover,
-  .tiny.preview-button:hover,
-  .button.tiny:focus,
-  .tiny.preview-button:focus {
-    background: ButtonText;
-  }
-
-  .button.tiny:active,
-  .tiny.preview-button:active {
-    background: ButtonFace;
-  }
-}
-
 .button.block-button,
 .block-button.preview-button {
   display: flex;
@@ -119,13 +88,6 @@ button img {
   overflow: hidden;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.block-button,
-  .block-button.preview-button {
-    border-color: ButtonBorder;
-  }
-}
-
 @media (max-width: 719px) {
   .button.block-button,
   .block-button.preview-button {
@@ -147,18 +109,6 @@ button img {
   background: #dedede;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.block-button:hover,
-  .block-button.preview-button:hover {
-    background: ButtonText;
-  }
-
-  .button.block-button:active,
-  .block-button.preview-button:active {
-    background: ButtonFace;
-  }
-}
-
 .button.download,
 .download.preview-button,
 .button.flag,
@@ -188,20 +138,6 @@ button img {
   background-color: #dedede;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.download:hover,
-  .download.preview-button:hover {
-    background-color: ButtonText;
-    color: ButtonFace;
-  }
-
-  .button.download:active,
-  .download.preview-button:active {
-    background-color: ButtonFace;
-    color: ButtonText;
-  }
-}
-
 .button.primary,
 .primary.highlight-retry-cancel,
 .primary.highlight-button-cancel,
@@ -232,40 +168,6 @@ button img {
   background-color: #0065cc;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.primary,
-  .primary.highlight-retry-cancel,
-  .primary.highlight-button-cancel,
-  .highlight-button-download,
-  .primary.highlight-button-copy {
-    background-color: ButtonFace;
-    color: ButtonText;
-  }
-
-  .button.primary:hover,
-  .primary.highlight-button-retry:hover,
-  .primary.highlight-button-cancel:hover,
-  .highlight-button-download:hover,
-  .primary.highlight-button-copy:hover,
-  .button.primary:focus,
-  .primary.highlight-button-retry:focus,
-  .primary.highlight-button-cancel:focus,
-  .highlight-button-download:focus,
-  .primary.highlight-button-copy:focus {
-    background-color: ButtonText;
-    color: ButtonFace;
-  }
-
-  .button.primary:active,
-  .primary.highlight-button-retry:active,
-  .primary.highlight-button-cancel:active,
-  .highlight-button-download:active,
-  .primary.highlight-button-copy:active {
-    background-color: ButtonFace;
-    color: ButtonText;
-  }
-}
-
 .button.secondary,
 .highlight-button-retry,
 .highlight-button-cancel,
@@ -291,35 +193,6 @@ button img {
   background-color: #dedede;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.secondary,
-  .highlight-button-retry,
-  .highlight-button-cancel,
-  .secondary.highlight-button-download,
-  .highlight-button-copy {
-    background-color: ButtonFace;
-    color: ButtonText;
-  }
-
-  .button.secondary:hover,
-  .highlight-button-retry:hover,
-  .highlight-button-cancel:hover,
-  .secondary.highlight-button-download:hover,
-  .highlight-button-copy:hover {
-    background-color: ButtonText;
-    color: ButtonFace;
-  }
-
-  .button.secondary:active,
-  .highlight-button-retry:active,
-  .highlight-button-cancel:active,
-  .secondary.highlight-button-download:active,
-  .highlight-button-copy:active {
-    background-color: ButtonFace;
-    color; ButtonText;
-  }
-}
-
 .button.transparent,
 .transparent.preview-button {
   background-color: transparent;
@@ -338,28 +211,6 @@ button img {
   background-color: #dedede;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.transparent,
-  .transparent.preview-button {
-    background-color: ButtonFace;
-    color: ButtonText;
-  }
-
-  .button.transparent:hover,
-  .transparent.preview-button:hover {
-    background-color: ButtonText;
-    color: ButtonFace;
-  }
-
-  .button.transparent:focus,
-  .transparent.preview-button:focus,
-  .button.transparent:active,
-  .transparent.preview-button:active {
-    background-color: ButtonFace;
-    color: ButtonText;
-  }
-}
-
 .button.warning,
 .warning.preview-button {
   color: #fff;
@@ -378,27 +229,6 @@ button img {
   background: #a11910;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  .button.warning,
-  .warning.preview-button {
-    color: ButtonText;
-    background: ButtonFace;
-  }
-
-  .button.warning:hover,
-  .warning.preview-button:hover,
-  .button.warning:focus,
-  .warning.preview-button:focus {
-    background: ButtonText;
-    color: ButtonFace;
-  }
-
-  .button.warning:active,
-  .warning.preview-button:active {
-    background: ButtonFace;
-  }
-}
-
 @keyframes bounce {
   0% {
     transform: translateX(-40px);

diff --git a/browser/components/screenshots/overlay/overlay.css b/browser/components/screenshots/overlay/overlay.css
@@ -73,12 +73,6 @@
   padding: 10px 25px;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  :-moz-native-anonymous #screenshots-cancel-button {
-    border-color: ButtonBorder;
-  }
-}
-
 :-moz-native-anonymous .screenshots-button {
   cursor: pointer;
   appearance: none;
@@ -108,23 +102,6 @@
   background-color: #ededf0;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  :-moz-native-anonymous .screenshots-button {
-    background-color: ButtonFace;
-    color: ButtonText;
-  }
-
-  :-moz-native-anonymous .screenshots-button:hover {
-    background-color: ButtonText;
-    color: ButtonFace;
-  }
-}
-
-:-moz-native-anonymous button img {
-  -moz-context-properties: fill;
-  fill: currentColor;
-}
-
 :-moz-native-anonymous #buttons {
   position: absolute;
   margin: 10px 8px;
@@ -145,33 +122,13 @@
   padding: 10px 0;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  :-moz-native-anonymous #cancel > img {
-    color: ButtonText;
-  }
-
-  :-moz-native-anonymous #cancel:hover > img {
-    color: ButtonFace;
-  }
-}
-
 :-moz-native-anonymous #copy > img {
   color: #38383d;
   content: url('chrome://browser/content/screenshots/copy.svg');
   width: 16px;
   height: 16px;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  :-moz-native-anonymous #copy > img {
-    color: ButtonText;
-  }
-
-  :-moz-native-anonymous #copy:hover > img {
-    color: ButtonFace;
-  }
-}
-
 :-moz-native-anonymous #download {
   background-color: #0a84ff;
   color: #fff;
@@ -182,23 +139,11 @@
 }
 
 :-moz-native-anonymous #download > img {
-  content: url('chrome://browser/content/screenshots/download.svg');
+  content: url('chrome://browser/content/screenshots/download-white.svg');
   width: 16px;
   height: 16px;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  :-moz-native-anonymous #download {
-    background-color: ButtonFace;
-    color: ButtonText;
-  }
-
-  :-moz-native-anonymous #download:hover {
-    background-color: ButtonText;
-    color: ButtonFace;
-  }
-}
-
 :-moz-native-anonymous .fixed-container {
   align-items: center;
   display: flex;
@@ -270,12 +215,6 @@
   width: 400px;
 }
 
-@media (forced-colors: active), (prefers-contrast) {
-  :-moz-native-anonymous .preview-instructions {
-    color: CanvasText;
-  }
-}
-
 :-moz-native-anonymous #hover-highlight {
   animation: fade-in 125ms forwards cubic-bezier(0.07, 0.95, 0, 1);
   background: rgba(255, 255, 255, 0.2);