diff --git a/mobile/android/themes/core/aboutReaderContent.css b/mobile/android/themes/core/aboutReaderContent.css new file mode 100644 index 000000000000..6dd0b9fc7ab8 --- /dev/null +++ b/mobile/android/themes/core/aboutReaderContent.css @@ -0,0 +1,5 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* TODO: Use shared aboutReaderContent.css from toolkit */ diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn index c783a90515e3..959d86c70acb 100644 --- a/mobile/android/themes/core/jar.mn +++ b/mobile/android/themes/core/jar.mn @@ -22,6 +22,7 @@ chrome.jar: skin/aboutMemory.css (aboutMemory.css) skin/aboutPrivateBrowsing.css (aboutPrivateBrowsing.css) skin/aboutReader.css (aboutReader.css) + skin/aboutReaderContent.css (aboutReaderContent.css) skin/aboutSupport.css (aboutSupport.css) skin/browser.css (browser.css) * skin/content.css (content.css) @@ -31,6 +32,7 @@ chrome.jar: % override chrome://global/skin/about.css chrome://browser/skin/about.css % override chrome://global/skin/aboutMemory.css chrome://browser/skin/aboutMemory.css % override chrome://global/skin/aboutReader.css chrome://browser/skin/aboutReader.css +% override chrome://global/skin/aboutReaderContent.css chrome://browser/skin/aboutReaderContent.css % override chrome://global/skin/aboutSupport.css chrome://browser/skin/aboutSupport.css % override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css % override chrome://global/skin/netError.css chrome://browser/skin/netError.css diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html index 14b48589096b..6e4e962aa500 100644 --- a/toolkit/components/reader/content/aboutReader.html +++ b/toolkit/components/reader/content/aboutReader.html @@ -19,7 +19,11 @@
-
+
+ +
diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index ce6f65a337d9..96fdec0fb9b5 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -11,6 +11,7 @@ toolkit.jar: skin/classic/global/aboutCacheEntry.css (../../shared/aboutCacheEntry.css) skin/classic/global/aboutMemory.css (../../shared/aboutMemory.css) * skin/classic/global/aboutReader.css (../../shared/aboutReader.css) + skin/classic/global/aboutReaderContent.css (../../shared/aboutReaderContent.css) skin/classic/global/aboutSupport.css (../../shared/aboutSupport.css) skin/classic/global/appPicker.css (../../shared/appPicker.css) skin/classic/global/arrow.css diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css index 53801de0b35b..392c1d49b4b3 100644 --- a/toolkit/themes/shared/aboutReader.css +++ b/toolkit/themes/shared/aboutReader.css @@ -33,6 +33,14 @@ body.loaded { background-color: #333333; } +.dark *::-moz-selection { + background-color: #FFFFFF; + color: #0095DD; +} +.dark a::-moz-selection { + color: #DD4800; +} + .sepia, .sepia-button { color: #333333; @@ -140,134 +148,6 @@ body.loaded { font-style: italic; } -/* Content */ - -#moz-reader-content { - display: none; - font-size: 1em; - line-height: 1.6em; -} - -.content h1, -.content h2, -.content h3 { - font-weight: bold; -} - -#moz-reader-content h1 { - font-size: 1.33em; - line-height: 1.25em; -} - -#moz-reader-content h2 { - font-size: 1.1em; - line-height: 1.51em; -} - -#moz-reader-content h3 { - font-size: 1em; - line-height: 1.66em; -} - -.content a { - text-decoration: underline; - font-weight: normal; -} - -.content a, -.content a:visited, -.content a:hover, -.content a:active { - color: #0095dd; -} - -.content * { - max-width: 100%; - height: auto; -} - -.content p, -.content code, -.content pre, -.content blockquote, -.content ul, -.content ol, -.content li, -.content figure, -.content .wp-caption { - margin: 0 0 30px 0; -} - -.content p > img:only-child, -.content p > a:only-child > img:only-child, -.content .wp-caption img, -.content figure img { - display: block; -} - -.content img[moz-reader-center] { - margin-left: auto; - margin-right: auto; -} - -#moz-reader-content .caption, -#moz-reader-content .wp-caption-text, -#moz-reader-content figcaption { - font-size: 0.9em; - line-height: 1.48em; - font-style: italic; -} - -.content code, -.content pre { - white-space: pre-wrap; -} - -.content blockquote { - padding: 0; - -moz-padding-start: 16px; -} - -.light > .container > .content blockquote, -.sepia > .container > .content blockquote { - -moz-border-start: 2px solid #333333; -} - -.dark > .container > .content blockquote { - -moz-border-start: 2px solid #eeeeee; -} -.dark *::-moz-selection { - background-color: #FFFFFF; - color: #0095DD; -} -.dark a::-moz-selection { - color: #DD4800; -} - -.content ul, -.content ol { - padding: 0; -} - -.content ul { - -moz-padding-start: 30px; - list-style: disc; -} - -.content ol { - -moz-padding-start: 30px; - list-style: decimal; -} - -/* Hide elements with common "hidden" class names */ -#moz-reader-content .visually-hidden, -#moz-reader-content .visuallyhidden, -#moz-reader-content .hidden, -#moz-reader-content .invisible, -#moz-reader-content .sr-only { - display: none; -} - /*======= Controls toolbar =======*/ .toolbar { diff --git a/toolkit/themes/shared/aboutReaderContent.css b/toolkit/themes/shared/aboutReaderContent.css new file mode 100644 index 000000000000..487f2ae24d49 --- /dev/null +++ b/toolkit/themes/shared/aboutReaderContent.css @@ -0,0 +1,122 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#moz-reader-content { + display: none; + font-size: 1em; + line-height: 1.6em; +} + +h1, +h2, +h3 { + font-weight: bold; +} + +h1 { + font-size: 1.33em; + line-height: 1.25em; +} + +h2 { + font-size: 1.1em; + line-height: 1.51em; +} + +h3 { + font-size: 1em; + line-height: 1.66em; +} + +a { + text-decoration: underline; + font-weight: normal; +} + +a, +a:visited, +a:hover, +a:active { + color: #0095dd; +} + +* { + max-width: 100%; + height: auto; +} + +p, +code, +pre, +blockquote, +ul, +ol, +li, +figure, +.wp-caption { + margin: 0 0 30px 0; +} + +p > img:only-child, +p > a:only-child > img:only-child, +.wp-caption img, +figure img { + display: block; +} + +img[moz-reader-center] { + margin-left: auto; + margin-right: auto; +} + +.caption, +.wp-caption-text, +figcaption { + font-size: 0.9em; + line-height: 1.48em; + font-style: italic; +} + +code, +pre { + white-space: pre-wrap; +} + +blockquote { + padding: 0; + -moz-padding-start: 16px; +} + +.light blockquote, +.sepia blockquote { + -moz-border-start: 2px solid #333333; +} + +.dark blockquote { + -moz-border-start: 2px solid #eeeeee; +} + +ul, +ol { + padding: 0; +} + +ul { + -moz-padding-start: 30px; + list-style: disc; +} + +ol { + -moz-padding-start: 30px; + list-style: decimal; +} + +/* Hide elements with common "hidden" class names */ +.visually-hidden, +.visuallyhidden, +.hidden, +.invisible, +.sr-only { + display: none; +} diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index 9549c232280c..a96022abe9a1 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -9,6 +9,7 @@ toolkit.jar: skin/classic/global/aboutCacheEntry.css (../../shared/aboutCacheEntry.css) skin/classic/global/aboutMemory.css (../../shared/aboutMemory.css) * skin/classic/global/aboutReader.css (../../shared/aboutReader.css) + skin/classic/global/aboutReaderContent.css (../../shared/aboutReaderContent.css) skin/classic/global/aboutSupport.css (../../shared/aboutSupport.css) skin/classic/global/appPicker.css (../../shared/appPicker.css) skin/classic/global/arrow.css