Merge branch 'master' into releaseRELBASE_20210719RC_20210715

3 files changed, 2 insertions, 26 deletions

diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
index 1bfbd0309d..c6cd959277 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -388,19 +388,7 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
 }
 
 /* Font sizes are different per-platform, so we need custom CSS to line them up. */
-%ifdef XP_MACOSX
-.font-type-buttons > .sans-serif-button > .name {
-  margin-top: 10px;
-}
-
-.font-type-buttons > .sans-serif-button > .description {
-  margin-top: -4px;
-}
-
-.font-type-buttons > .serif-button > .name {
-  font-size: 63px;
-}
-%elifdef XP_WIN
+%ifdef XP_WIN
 .font-type-buttons > .sans-serif-button > .name {
   margin-top: 2px;
 }
diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn
index 3755688279..08f3250dcc 100644
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -62,7 +62,7 @@ toolkit.jar:
   skin/classic/global/media/TopLevelVideoDocument.css      (../../shared/media/TopLevelVideoDocument.css)
   skin/classic/global/media/imagedoc-lightnoise.png        (../../shared/media/imagedoc-lightnoise.png)
   skin/classic/global/media/imagedoc-darknoise.png         (../../shared/media/imagedoc-darknoise.png)
-* skin/classic/global/media/videocontrols.css              (../../shared/media/videocontrols.css)
+  skin/classic/global/media/videocontrols.css              (../../shared/media/videocontrols.css)
   skin/classic/global/media/pauseButton.png                (../../shared/media/pauseButton.png)
   skin/classic/global/media/pauseButton@2x.png             (../../shared/media/pauseButton@2x.png)
   skin/classic/global/media/playButton.png                 (../../shared/media/playButton.png)
diff --git a/toolkit/themes/shared/media/videocontrols.css b/toolkit/themes/shared/media/videocontrols.css
index a40d77fe3a..690762062b 100644
--- a/toolkit/themes/shared/media/videocontrols.css
+++ b/toolkit/themes/shared/media/videocontrols.css
@@ -165,15 +165,9 @@
   font-size: 11px;
 }
 
-%ifdef XP_MACOSX
-.durationLabel {
-  padding-top: 2px; /* center vertically with scrubber bar */
-}
-%else
 .durationLabel {
   padding-top: 0; /* center vertically with scrubber bar */
 }
-%endif
 
 .positionLabel {
   display: none;
@@ -259,15 +253,9 @@
   padding-top: 7px;
 }
 
-%ifdef XP_MACOSX
-.timeLabel {
-  padding-top: 7px; /* center vertically with scrubber bar */
-}
-%else
 .timeLabel {
   padding-top: 5px; /* center vertically with scrubber bar */
 }
-%endif
 
 .statusOverlay {
   -moz-box-align: center;