From 05d88b715bfe2d4182243143fd89f88ee9b799a2 Mon Sep 17 00:00:00 2001 From: Itiel Date: Thu, 18 Feb 2021 22:05:09 +0000 Subject: [PATCH] Bug 1692301 - Add dark mode support for about:buildconfig r=mconley,glandium Also make it so it'd match the style of other about: pages. Differential Revision: https://phabricator.services.mozilla.com/D104877 --- python/mozbuild/mozpack/test/test_unify.py | 34 +++--- python/mozbuild/mozpack/unify.py | 10 +- toolkit/content/buildconfig.css | 14 ++- toolkit/content/buildconfig.html | 120 +++++++++++---------- 4 files changed, 98 insertions(+), 80 deletions(-) diff --git a/python/mozbuild/mozpack/test/test_unify.py b/python/mozbuild/mozpack/test/test_unify.py index 85666c572439..40dea81aa524 100644 --- a/python/mozbuild/mozpack/test/test_unify.py +++ b/python/mozbuild/mozpack/test/test_unify.py @@ -97,10 +97,12 @@ class TestUnifiedBuildFinder(TestUnified): "\n".join( [ "", - "", - "

Build Configuration

", - "
foo
", - "", + " ", + "
", + "

Build Configuration

", + "
foo
", + "
", + " ", "", ] ), @@ -111,10 +113,12 @@ class TestUnifiedBuildFinder(TestUnified): "\n".join( [ "", - "", - "

Build Configuration

", - "
bar
", - "", + " ", + "
", + "

Build Configuration

", + "
bar
", + "
", + " ", "", ] ), @@ -132,12 +136,14 @@ class TestUnifiedBuildFinder(TestUnified): "\n".join( [ "", - "", - "

Build Configuration

", - "
foo
", - "
", - "
bar
", - "", + " ", + "
", + "

Build Configuration

", + "
foo
", + "
", + "
bar
", + "
", + " ", "", ] ), diff --git a/python/mozbuild/mozpack/unify.py b/python/mozbuild/mozpack/unify.py index 4096ac764994..5b91184ee700 100644 --- a/python/mozbuild/mozpack/unify.py +++ b/python/mozbuild/mozpack/unify.py @@ -220,14 +220,16 @@ class UnifiedBuildFinder(UnifiedFinder): if file1 and file2 and basename == "buildconfig.html": content1 = file1.open().readlines() content2 = file2.open().readlines() - # Copy everything from the first file up to the end of its , + # Copy everything from the first file up to the end of its
, # insert a
between the two files and copy the second file's # content beginning after its leading

. return GeneratedFile( b"".join( - content1[: content1.index(b"\n")] - + [b"
\n"] - + content2[content2.index(b"

Build Configuration

\n") + 1 :] + content1[: content1.index(b"
\n")] + + [b"
\n"] + + content2[ + content2.index(b"

Build Configuration

\n") + 1 : + ] ) ) elif file1 and file2 and basename == "install.rdf": diff --git a/toolkit/content/buildconfig.css b/toolkit/content/buildconfig.css index 43064488e6e9..e4c9306c874a 100644 --- a/toolkit/content/buildconfig.css +++ b/toolkit/content/buildconfig.css @@ -2,6 +2,14 @@ * 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/. */ -th { text-align: start; } -h2 { margin-top: 1.5em; } -th, td { vertical-align: top; } +h2 { + margin-top: 1.5em; +} + +p { + font: message-box; +} + +.build-platform-table { + width: auto; +} diff --git a/toolkit/content/buildconfig.html b/toolkit/content/buildconfig.html index 5e7e77bc6167..e4263babf47d 100644 --- a/toolkit/content/buildconfig.html +++ b/toolkit/content/buildconfig.html @@ -6,63 +6,65 @@ #filter substitution #include @TOPOBJDIR@/source-repo.h - - - - - Build Configuration - - - - -

Build Configuration

-#ifdef MOZ_SOURCE_URL -

Source

-

Built from @MOZ_SOURCE_URL@

-#endif -

Build platform

- - - - - - - - - -
target
@target@
-#if defined(CC) && defined(CXX) && defined(RUSTC) -

Build tools

- - - - - - - - - - - - - - - - - - - - - - - -
CompilerVersionCompiler flags
@CC@@CC_VERSION@@CFLAGS@
@CXX@@CC_VERSION@@CXXFLAGS@
@RUSTC@@RUSTC_VERSION@@RUSTFLAGS@
-#endif -

Configure options

-

@MOZ_CONFIGURE_OPTIONS@

-#ifdef ANDROID -

Package name

-

@ANDROID_PACKAGE_NAME@

-#endif - + + + + + Build Configuration + + + + +
+

Build Configuration

+ #ifdef MOZ_SOURCE_URL +

Source

+

Built from @MOZ_SOURCE_URL@

+ #endif +

Build platform

+ + + + + + + + + +
target
@target@
+ #if defined(CC) && defined(CXX) && defined(RUSTC) +

Build tools

+ + + + + + + + + + + + + + + + + + + + + + + +
CompilerVersionCompiler flags
@CC@@CC_VERSION@@CFLAGS@
@CXX@@CC_VERSION@@CXXFLAGS@
@RUSTC@@RUSTC_VERSION@@RUSTFLAGS@
+ #endif +

Configure options

+

@MOZ_CONFIGURE_OPTIONS@

+ #ifdef ANDROID +

Package name

+

@ANDROID_PACKAGE_NAME@

+ #endif +
+