зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1693815 - Remove illustrations on error pages r=emalysz
Differential Revision: https://phabricator.services.mozilla.com/D108883
This commit is contained in:
Michelle Goossens
Родитель
5391deaa4c
Коммит
1a08eedf0c
|
|
@ -237,7 +237,10 @@ function initPage() {
|
|||
"netReset",
|
||||
"netOffline",
|
||||
];
|
||||
if (illustratedErrors.includes(err)) {
|
||||
if (
|
||||
illustratedErrors.includes(err) &&
|
||||
!RPMGetBoolPref("browser.proton.enabled")
|
||||
) {
|
||||
document.body.classList.add("illustrated", err);
|
||||
}
|
||||
if (err == "blockedByPolicy") {
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
<div id="errorPageContainer" class="container">
|
||||
<div id="text-container">
|
||||
<!-- Error Title -->
|
||||
<div class="title">
|
||||
<div class="title noIllustration">
|
||||
<h1 class="title-text"/>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<body>
|
||||
<div id="main" class="container" multiple="false">
|
||||
|
||||
<div class="title">
|
||||
<div class="title noIllustration">
|
||||
<h1 class="title-text" data-l10n-id="crashed-header"></h1>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
<div class="container">
|
||||
|
||||
<div class="title">
|
||||
<div class="title noIllustration">
|
||||
<h1 class="title-text" data-l10n-id="welcome-back-page-title"></h1>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -193,6 +193,7 @@ body:not(.neterror) #advancedButton {
|
|||
display: none;
|
||||
}
|
||||
|
||||
@supports not -moz-bool-pref("browser.proton.enabled") {
|
||||
.connectionFailure #errorPageContainer,
|
||||
.netInterrupt #errorPageContainer,
|
||||
.netTimeout #errorPageContainer,
|
||||
|
|
@ -213,6 +214,7 @@ body:not(.neterror) #advancedButton {
|
|||
background-image: url("chrome://browser/skin/illustrations/blue-berror.svg");
|
||||
background-size: 18.5em;
|
||||
}
|
||||
} /* END !proton */
|
||||
|
||||
.clockSkewError #returnButton {
|
||||
display: none;
|
||||
|
|
|
|||
|
|
@ -4,17 +4,6 @@
|
|||
|
||||
@import url("chrome://browser/skin/error-pages.css");
|
||||
|
||||
.illustrated #errorPageContainer {
|
||||
min-height: 300px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background-position: left center;
|
||||
}
|
||||
|
||||
#errorPageContainer:dir(rtl) {
|
||||
background-position-x: right;
|
||||
}
|
||||
|
||||
#header {
|
||||
background: none;
|
||||
padding-inline-start: 0;
|
||||
|
|
@ -23,6 +12,14 @@
|
|||
|
||||
#text-container {
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
@supports not -moz-bool-pref("browser.proton.enabled") {
|
||||
#errorPageContainer:dir(rtl) {
|
||||
background-position-x: right;
|
||||
}
|
||||
|
||||
#text-container {
|
||||
padding-inline-start: 38%;
|
||||
}
|
||||
|
||||
|
|
@ -35,6 +32,7 @@
|
|||
background-size: 38%;
|
||||
background-image: url("chrome://browser/skin/illustrations/error-connection-failure.svg");
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
#restart {
|
||||
margin-top: 1.2em;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
* 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/. */
|
||||
|
||||
@supports not -moz-bool-pref("browser.proton.enabled") {
|
||||
.description-wrapper {
|
||||
background-image: url("chrome://browser/skin/illustrations/error-session-restore.svg");
|
||||
background-repeat: no-repeat;
|
||||
|
|
@ -10,6 +11,7 @@
|
|||
background-position: left center;
|
||||
min-height: 300px;
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
.description-wrapper:dir(rtl) {
|
||||
background-position-x: right;
|
||||
|
|
|
|||
|
|
@ -6,9 +6,11 @@ body {
|
|||
font-size: 1.25rem;
|
||||
}
|
||||
|
||||
@supports not -moz-bool-pref("browser.proton.enabled") {
|
||||
.title {
|
||||
background-image: url("chrome://browser/skin/tab-crashed.svg");
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
#reportSent {
|
||||
font-weight: bold;
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
* 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/. */
|
||||
|
||||
@supports not -moz-bool-pref("browser.proton.enabled") {
|
||||
.title {
|
||||
background-image: url("chrome://browser/skin/welcome-back.svg");
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
.radioRestoreContainer:not(:last-child) {
|
||||
margin-bottom: 0.3em;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ body {
|
|||
flex: 1;
|
||||
}
|
||||
|
||||
@supports not -moz-bool-pref("browser.proton.enabled") {
|
||||
.illustrated #errorPageContainer {
|
||||
min-height: 300px;
|
||||
display: flex;
|
||||
|
|
@ -48,6 +49,7 @@ body {
|
|||
margin: auto;
|
||||
padding-inline-start: 38%;
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
@media only screen and (max-width: 959px) {
|
||||
body {
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ let RemotePageAccessManager = {
|
|||
"security.certerrors.tls.version.show-override",
|
||||
"security.xfocsp.errorReporting.automatic",
|
||||
"security.xfocsp.errorReporting.enabled",
|
||||
"browser.proton.enabled",
|
||||
],
|
||||
RPMSetBoolPref: [
|
||||
"security.tls.version.enable-deprecated",
|
||||
|
|
|
|||
|
|
@ -49,6 +49,16 @@ body.wide-container {
|
|||
fill: currentColor;
|
||||
}
|
||||
|
||||
@supports -moz-bool-pref("browser.proton.enabled") {
|
||||
.noIllustration {
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
.container.restore-chosen {
|
||||
margin: 25vh 0;
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
.title:-moz-locale-dir(rtl),
|
||||
.title:dir(rtl) {
|
||||
background-position: right 0;
|
||||
|
|
@ -170,10 +180,12 @@ td {
|
|||
}
|
||||
|
||||
/* Illustrated Info Pages */
|
||||
@supports not -moz-bool-pref("browser.proton.enabled") {
|
||||
.illustrated .title {
|
||||
margin-inline-start: 0;
|
||||
padding-inline-start: 0;
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
.notice-box {
|
||||
background-color: var(--in-content-table-background);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче