Issue #1829 - Revert “Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.”

This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.

This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.

3 files changed, 26 insertions, 2 deletions

diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
index c6cd959277..1bfbd0309d 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -388,7 +388,19 @@ 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_WIN
+%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
 .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 08f3250dcc..3755688279 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 690762062b..a40d77fe3a 100644
--- a/toolkit/themes/shared/media/videocontrols.css
+++ b/toolkit/themes/shared/media/videocontrols.css
@@ -165,9 +165,15 @@
   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;
@@ -253,9 +259,15 @@
   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;