corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1692301 - Add dark mode support for about:buildconfig r=mconley,glandium

Browse Source 
Also make it so it'd match the style of other about: pages.

Differential Revision: https://phabricator.services.mozilla.com/D104877
This commit is contained in:
Itiel
2021-02-18 22:05:09 +00:00
parent 48a3974a10
commit d66853fd2c
4 changed files with 98 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
python/mozbuild/mozpack/test/test_unify.py
View File

@@ -97,10 +97,12 @@ class TestUnifiedBuildFinder(TestUnified):
"\n".join( "\n".join(
[ [
"<html>", "<html>",
"<body>", " <body>",
"<h1>Build Configuration</h1>", " <div>",
"<div>foo</div>", " <h1>Build Configuration</h1>",
"</body>", " <div>foo</div>",
" </div>",
" </body>",
"</html>", "</html>",
] ]
), ),
@@ -111,10 +113,12 @@ class TestUnifiedBuildFinder(TestUnified):
"\n".join( "\n".join(
[ [
"<html>", "<html>",
"<body>", " <body>",
"<h1>Build Configuration</h1>", " <div>",
"<div>bar</div>", " <h1>Build Configuration</h1>",
"</body>", " <div>bar</div>",
" </div>",
" </body>",
"</html>", "</html>",
] ]
), ),
@@ -132,12 +136,14 @@ class TestUnifiedBuildFinder(TestUnified):
"\n".join( "\n".join(
[ [
"<html>", "<html>",
"<body>", " <body>",
"<h1>Build Configuration</h1>", " <div>",
"<div>foo</div>", " <h1>Build Configuration</h1>",
"<hr> </hr>", " <div>foo</div>",
"<div>bar</div>", " <hr> </hr>",
"</body>", " <div>bar</div>",
" </div>",
" </body>",
"</html>", "</html>",
] ]
), ),

10
python/mozbuild/mozpack/unify.py
View File

@@ -220,14 +220,16 @@ class UnifiedBuildFinder(UnifiedFinder):
if file1 and file2 and basename == "buildconfig.html": if file1 and file2 and basename == "buildconfig.html":
content1 = file1.open().readlines() content1 = file1.open().readlines()
content2 = file2.open().readlines() content2 = file2.open().readlines()
# Copy everything from the first file up to the end of its <body>, # Copy everything from the first file up to the end of its <div>,
# insert a <hr> between the two files and copy the second file's # insert a <hr> between the two files and copy the second file's
# content beginning after its leading <h1>. # content beginning after its leading <h1>.
return GeneratedFile( return GeneratedFile(
b"".join( b"".join(
content1[: content1.index(b"</body>\n")] content1[: content1.index(b" </div>\n")]
+ [b"<hr> </hr>\n"] + [b" <hr> </hr>\n"]
+ content2[content2.index(b"<h1>Build Configuration</h1>\n") + 1 :] + content2[
content2.index(b" <h1>Build Configuration</h1>\n") + 1 :
]
) )
) )
elif file1 and file2 and basename == "install.rdf": elif file1 and file2 and basename == "install.rdf":

14
toolkit/content/buildconfig.css
View File

@@ -2,6 +2,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
th { text-align: start; } h2 {
h2 { margin-top: 1.5em; } margin-top: 1.5em;
th, td { vertical-align: top; } }
p {
font: message-box;
}
.build-platform-table {
width: auto;
}

120
toolkit/content/buildconfig.html
View File

@@ -6,63 +6,65 @@
#filter substitution #filter substitution
#include @TOPOBJDIR@/source-repo.h #include @TOPOBJDIR@/source-repo.h
<html> <html>
<head> <head>
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src chrome:; object-src 'none'" /> <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src chrome:; object-src 'none'" />
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width; user-scalable=false;"> <meta name="viewport" content="width=device-width; user-scalable=false;">
<title>Build Configuration</title> <title>Build Configuration</title>
<link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"> <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css">
<link rel="stylesheet" href="chrome://global/content/buildconfig.css" type="text/css"> <link rel="stylesheet" href="chrome://global/content/buildconfig.css" type="text/css">
</head> </head>
<body class="aboutPageWideContainer"> <body>
<h1>Build Configuration</h1> <div class="container">
#ifdef MOZ_SOURCE_URL <h1>Build Configuration</h1>
<h2>Source</h2> #ifdef MOZ_SOURCE_URL
<p>Built from <a href="@MOZ_SOURCE_URL@">@MOZ_SOURCE_URL@</a></p> <h2>Source</h2>
#endif <p>Built from <a href="@MOZ_SOURCE_URL@">@MOZ_SOURCE_URL@</a></p>
<h2>Build platform</h2> #endif
<table> <h2>Build platform</h2>
<tbody> <table class="build-platform-table">
<tr> <tbody>
<th>target</th> <tr>
</tr> <th>target</th>
<tr> </tr>
<td>@target@</td> <tr>
</tr> <td>@target@</td>
</tbody> </tr>
</table> </tbody>
#if defined(CC) && defined(CXX) && defined(RUSTC) </table>
<h2>Build tools</h2> #if defined(CC) && defined(CXX) && defined(RUSTC)
<table> <h2>Build tools</h2>
<tbody> <table>
<tr> <tbody>
<th>Compiler</th> <tr>
<th>Version</th> <th>Compiler</th>
<th>Compiler flags</th> <th>Version</th>
</tr> <th>Compiler flags</th>
<tr> </tr>
<td>@CC@</td> <tr>
<td>@CC_VERSION@</td> <td>@CC@</td>
<td>@CFLAGS@</td> <td>@CC_VERSION@</td>
</tr> <td>@CFLAGS@</td>
<tr> </tr>
<td>@CXX@</td> <tr>
<td>@CC_VERSION@</td> <td>@CXX@</td>
<td>@CXXFLAGS@</td> <td>@CC_VERSION@</td>
</tr> <td>@CXXFLAGS@</td>
<tr> </tr>
<td>@RUSTC@</td> <tr>
<td>@RUSTC_VERSION@</td> <td>@RUSTC@</td>
<td>@RUSTFLAGS@</td> <td>@RUSTC_VERSION@</td>
</tr> <td>@RUSTFLAGS@</td>
</tbody> </tr>
</table> </tbody>
#endif </table>
<h2>Configure options</h2> #endif
<p>@MOZ_CONFIGURE_OPTIONS@</p> <h2>Configure options</h2>
#ifdef ANDROID <p>@MOZ_CONFIGURE_OPTIONS@</p>
<h2>Package name</h2> #ifdef ANDROID
<p>@ANDROID_PACKAGE_NAME@</p> <h2>Package name</h2>
#endif <p>@ANDROID_PACKAGE_NAME@</p>
</body> #endif
</div>
</body>
</html> </html>