From: Robert Kaiser Date: Sun, 10 Jan 2016 05:00:47 +0000 (+0100) Subject: make devtools, Sync prefs, and neterror pages work right up to current nightly X-Git-Tag: LCARStrek-2.38^0 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=13875a54c4ffb8d452d1dc3745fdbab3f906da8f;p=themes.git make devtools, Sync prefs, and neterror pages work right up to current nightly --- diff --git a/LCARStrek/browser/aboutNetError.css b/LCARStrek/browser/aboutNetError.css index eb06ff0b..6f94c658 100644 --- a/LCARStrek/browser/aboutNetError.css +++ b/LCARStrek/browser/aboutNetError.css @@ -45,14 +45,15 @@ ul { padding-bottom: 0.4em; } -#errorTitle[sslv3] { - background-image: url("aboutNetError_alert.svg"); -} - #errorTitleText:-moz-dir(rtl) { background-position: right 0; } +#errorTitle[sslv3=true], +#errorTitle[weakCrypto=true] { + background-image: url("cert-error.svg"); +} + #errorTryAgain { margin-top: 1.2em; min-width: 150px @@ -63,7 +64,9 @@ ul { } @media (max-width: 675px) { - #errorTitle { + #errorTitle, + #errorTitle[sslv3=true], + #errorTitle[weakCrypto=true] { padding-top: 0; background-image: none; -moz-padding-start: 0; @@ -78,6 +81,47 @@ button:disabled { cursor: pointer; } +#learnMoreContainer { + display: none; +} + +#buttonContainer { + display: none; + flex-flow: row wrap; +} + +#buttonSpacer { + flex: 1; +} + +#returnButton { + background-color: var(--in-content-primary-button-background); + border: none; + color: var(--in-content-selected-text); + min-width: 250px; + margin-inline-start: 0; +} + +#returnButton:hover { + background-color: var(--in-content-primary-button-background-hover) !important; +} + +#returnButton:hover:active { + background-color: var(--in-content-primary-button-background-active) !important; +} + +#advancedButton { + display: none; + min-width: 150px; +} + +#certificateErrorReporting, +#reportCertificateError, +#reportSentMessage { + display: none; +} + +div#weakCryptoAdvanced, div#certificateErrorReporting { display: none; float: right; @@ -110,6 +154,7 @@ span.downArrow { transform: scaleY(0.7); } +div#weakCryptoAdvancedPanel, div#certificateErrorReportingPanel { /* Hidden until the link is clicked */ display: none; @@ -132,6 +177,7 @@ div#certificateErrorReportingPanel:-moz-dir(rtl) { right: 0; } +#overrideWeakCryptoPanel, #errorStatePanel { display: flex; flex-direction: row; @@ -149,6 +195,12 @@ span#hostname { cursor: pointer; } +#errorCode { + color: var(--in-content-page-color); + cursor: text; + text-decoration: none; +} + #reportSendingMessage { /* adjust the line-height to match the link */ line-height: 22px; diff --git a/LCARStrek/browser/aboutNetError_alert.svg b/LCARStrek/browser/aboutNetError_alert.svg deleted file mode 100644 index 49ed4e7f..00000000 --- a/LCARStrek/browser/aboutNetError_alert.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 64c688a1..23c1d857 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -517,6 +517,10 @@ menuitem.bookmark-item { #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/ToolbarFx.png"); } +toolbar[brighttext] #pocket-button, +#pocket-button { + list-style-image: url("chrome://browser/skin/ToolbarFx.png") !important; /* override pocket.css */ +} #back-button { -moz-image-region: rect(0, 36px, 18px, 18px); diff --git a/LCARStrek/browser/cert-error.svg b/LCARStrek/browser/cert-error.svg new file mode 100644 index 00000000..5151442d --- /dev/null +++ b/LCARStrek/browser/cert-error.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/add.svg b/LCARStrek/browser/devtools/images/add.svg new file mode 100644 index 00000000..a9c169ce --- /dev/null +++ b/LCARStrek/browser/devtools/images/add.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/LCARStrek/browser/devtools/images/close@2x.png b/LCARStrek/browser/devtools/images/close@2x.png new file mode 100644 index 00000000..89423836 Binary files /dev/null and b/LCARStrek/browser/devtools/images/close@2x.png differ diff --git a/LCARStrek/browser/devtools/images/command-eyedropper.png b/LCARStrek/browser/devtools/images/command-eyedropper.png new file mode 100644 index 00000000..6b95ad1c Binary files /dev/null and b/LCARStrek/browser/devtools/images/command-eyedropper.png differ diff --git a/LCARStrek/browser/devtools/images/command-eyedropper@2x.png b/LCARStrek/browser/devtools/images/command-eyedropper@2x.png new file mode 100644 index 00000000..6cd4fdb9 Binary files /dev/null and b/LCARStrek/browser/devtools/images/command-eyedropper@2x.png differ diff --git a/LCARStrek/browser/devtools/images/command-measure.png b/LCARStrek/browser/devtools/images/command-measure.png new file mode 100644 index 00000000..e9637fd6 Binary files /dev/null and b/LCARStrek/browser/devtools/images/command-measure.png differ diff --git a/LCARStrek/browser/devtools/images/command-measure@2x.png b/LCARStrek/browser/devtools/images/command-measure@2x.png new file mode 100644 index 00000000..13d78442 Binary files /dev/null and b/LCARStrek/browser/devtools/images/command-measure@2x.png differ diff --git a/LCARStrek/browser/devtools/images/editor-breakpoint.png b/LCARStrek/browser/devtools/images/editor-breakpoint.png new file mode 100644 index 00000000..c94886e1 Binary files /dev/null and b/LCARStrek/browser/devtools/images/editor-breakpoint.png differ diff --git a/LCARStrek/browser/devtools/images/editor-breakpoint@2x.png b/LCARStrek/browser/devtools/images/editor-breakpoint@2x.png new file mode 100644 index 00000000..38a6f91f Binary files /dev/null and b/LCARStrek/browser/devtools/images/editor-breakpoint@2x.png differ diff --git a/LCARStrek/browser/devtools/images/editor-debug-location.png b/LCARStrek/browser/devtools/images/editor-debug-location.png new file mode 100644 index 00000000..6b219a21 Binary files /dev/null and b/LCARStrek/browser/devtools/images/editor-debug-location.png differ diff --git a/LCARStrek/browser/devtools/images/editor-debug-location@2x.png b/LCARStrek/browser/devtools/images/editor-debug-location@2x.png new file mode 100644 index 00000000..55b116f6 Binary files /dev/null and b/LCARStrek/browser/devtools/images/editor-debug-location@2x.png differ diff --git a/LCARStrek/browser/devtools/images/editor-error.png b/LCARStrek/browser/devtools/images/editor-error.png new file mode 100644 index 00000000..786fc7d0 Binary files /dev/null and b/LCARStrek/browser/devtools/images/editor-error.png differ diff --git a/LCARStrek/browser/devtools/images/filters.svg b/LCARStrek/browser/devtools/images/filters.svg new file mode 100644 index 00000000..a06b3429 --- /dev/null +++ b/LCARStrek/browser/devtools/images/filters.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/magnifying-glass-light.png b/LCARStrek/browser/devtools/images/magnifying-glass-light.png new file mode 100644 index 00000000..8d50b9df Binary files /dev/null and b/LCARStrek/browser/devtools/images/magnifying-glass-light.png differ diff --git a/LCARStrek/browser/devtools/images/magnifying-glass.png b/LCARStrek/browser/devtools/images/magnifying-glass.png new file mode 100644 index 00000000..8d50b9df Binary files /dev/null and b/LCARStrek/browser/devtools/images/magnifying-glass.png differ diff --git a/LCARStrek/browser/devtools/images/pseudo-class.svg b/LCARStrek/browser/devtools/images/pseudo-class.svg new file mode 100644 index 00000000..5c41473d --- /dev/null +++ b/LCARStrek/browser/devtools/images/pseudo-class.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-canvas.svg b/LCARStrek/browser/devtools/images/tool-canvas.svg new file mode 100644 index 00000000..13c4783f --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-canvas.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/LCARStrek/browser/devtools/images/tool-debugger-paused.svg b/LCARStrek/browser/devtools/images/tool-debugger-paused.svg new file mode 100644 index 00000000..2ab4e444 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-debugger-paused.svg @@ -0,0 +1,6 @@ + + + + diff --git a/LCARStrek/browser/devtools/images/tool-debugger.svg b/LCARStrek/browser/devtools/images/tool-debugger.svg new file mode 100644 index 00000000..5248a1d5 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-debugger.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-inspector.svg b/LCARStrek/browser/devtools/images/tool-inspector.svg new file mode 100644 index 00000000..8588d229 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-inspector.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-memory-active.svg b/LCARStrek/browser/devtools/images/tool-memory-active.svg new file mode 100644 index 00000000..6a6b90c7 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-memory-active.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-memory.svg b/LCARStrek/browser/devtools/images/tool-memory.svg new file mode 100644 index 00000000..6f669e43 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-memory.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-network.svg b/LCARStrek/browser/devtools/images/tool-network.svg new file mode 100644 index 00000000..2a036c69 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-network.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-options-tbutton.svg b/LCARStrek/browser/devtools/images/tool-options-tbutton.svg new file mode 100644 index 00000000..b54c3cce --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-options-tbutton.svg @@ -0,0 +1,6 @@ + + + + diff --git a/LCARStrek/browser/devtools/images/tool-options.svg b/LCARStrek/browser/devtools/images/tool-options.svg new file mode 100644 index 00000000..c2c1c37c --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-options.svg @@ -0,0 +1,6 @@ + + + + diff --git a/LCARStrek/browser/devtools/images/tool-profiler-active.svg b/LCARStrek/browser/devtools/images/tool-profiler-active.svg new file mode 100644 index 00000000..bf0c54aa --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-profiler-active.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-profiler.svg b/LCARStrek/browser/devtools/images/tool-profiler.svg new file mode 100644 index 00000000..d91760df --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-profiler.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-scratchpad.svg b/LCARStrek/browser/devtools/images/tool-scratchpad.svg new file mode 100644 index 00000000..82ae8f82 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-scratchpad.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-shadereditor.svg b/LCARStrek/browser/devtools/images/tool-shadereditor.svg new file mode 100644 index 00000000..8861bb3c --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-shadereditor.svg @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/LCARStrek/browser/devtools/images/tool-storage.svg b/LCARStrek/browser/devtools/images/tool-storage.svg new file mode 100644 index 00000000..aa0b8ad6 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-storage.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-styleeditor.svg b/LCARStrek/browser/devtools/images/tool-styleeditor.svg new file mode 100644 index 00000000..718c22f6 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-styleeditor.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/LCARStrek/browser/devtools/images/tool-webaudio.svg b/LCARStrek/browser/devtools/images/tool-webaudio.svg new file mode 100644 index 00000000..e07dc842 --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-webaudio.svg @@ -0,0 +1,6 @@ + + + + diff --git a/LCARStrek/browser/devtools/images/tool-webconsole.svg b/LCARStrek/browser/devtools/images/tool-webconsole.svg new file mode 100644 index 00000000..4b25e5ef --- /dev/null +++ b/LCARStrek/browser/devtools/images/tool-webconsole.svg @@ -0,0 +1,6 @@ + + + + diff --git a/LCARStrek/browser/fxa/android.png b/LCARStrek/browser/fxa/android.png new file mode 100644 index 00000000..b0e437f6 Binary files /dev/null and b/LCARStrek/browser/fxa/android.png differ diff --git a/LCARStrek/browser/fxa/android@2x.png b/LCARStrek/browser/fxa/android@2x.png new file mode 100644 index 00000000..cf00b909 Binary files /dev/null and b/LCARStrek/browser/fxa/android@2x.png differ diff --git a/LCARStrek/browser/fxa/default-avatar.png b/LCARStrek/browser/fxa/default-avatar.png new file mode 100644 index 00000000..68ee0411 Binary files /dev/null and b/LCARStrek/browser/fxa/default-avatar.png differ diff --git a/LCARStrek/browser/fxa/default-avatar@2x.png b/LCARStrek/browser/fxa/default-avatar@2x.png new file mode 100644 index 00000000..aa9f5926 Binary files /dev/null and b/LCARStrek/browser/fxa/default-avatar@2x.png differ diff --git a/LCARStrek/browser/fxa/logo.png b/LCARStrek/browser/fxa/logo.png new file mode 100644 index 00000000..3ab01597 Binary files /dev/null and b/LCARStrek/browser/fxa/logo.png differ diff --git a/LCARStrek/browser/fxa/logo@2x.png b/LCARStrek/browser/fxa/logo@2x.png new file mode 100644 index 00000000..858ed216 Binary files /dev/null and b/LCARStrek/browser/fxa/logo@2x.png differ diff --git a/LCARStrek/browser/fxa/sync-illustration.png b/LCARStrek/browser/fxa/sync-illustration.png new file mode 100644 index 00000000..693ee667 Binary files /dev/null and b/LCARStrek/browser/fxa/sync-illustration.png differ diff --git a/LCARStrek/browser/fxa/sync-illustration.svg b/LCARStrek/browser/fxa/sync-illustration.svg new file mode 100644 index 00000000..e0672127 --- /dev/null +++ b/LCARStrek/browser/fxa/sync-illustration.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/fxa/sync-illustration@2x.png b/LCARStrek/browser/fxa/sync-illustration@2x.png new file mode 100644 index 00000000..27a18fe2 Binary files /dev/null and b/LCARStrek/browser/fxa/sync-illustration@2x.png differ diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 60ad0001..14169fc5 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -2,7 +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/. */ -/* === BEGIN shared/in-content/preferences.css === */ +/* === BEGIN shared/incontentprefs/preferences.inc.css === */ @namespace html "http://www.w3.org/1999/xhtml"; @@ -261,9 +261,8 @@ treecol { #historyPane:not([selectedIndex="2"]) > #historyCustomPane, #weavePrefsDeck:not([selectedIndex="1"]) > #hasAccount, #weavePrefsDeck:not([selectedIndex="2"]) > #needsUpdate, -#weavePrefsDeck:not([selectedIndex="3"]) > #fxaDeterminingStatus, -#weavePrefsDeck:not([selectedIndex="4"]) > #noFxaAccount, -#weavePrefsDeck:not([selectedIndex="5"]) > #hasFxaAccount, +#weavePrefsDeck:not([selectedIndex="3"]) > #noFxaAccount, +#weavePrefsDeck:not([selectedIndex="4"]) > #hasFxaAccount, #fxaLoginStatus:not([selectedIndex="1"]) > #fxaLoginUnverified, #fxaLoginStatus:not([selectedIndex="2"]) > #fxaLoginRejected { visibility: collapse; @@ -442,16 +441,226 @@ description > html|a { * Sync */ -#fxaDeviceName { - margin: 14px 0px; +#fxaProfileImage { + max-width: 60px; + border-radius: 50%; + list-style-image: url(chrome://browser/skin/fxa/default-avatar.png); + margin-inline-end: 15px; +} + +#fxaProfileImage.actionable { + cursor: pointer; +} + +#fxaProfileImage.actionable:hover { +} + +#fxaProfileImage.actionable:hover:active { +} + +#noFxaAccount { + /* Overriding the margins from the base preferences.css theme file. + These overrides can be simplified by fixing bug 1027174 */ + margin: 0; + padding-top: 15px; +} + +#fxaContentWrapper { + -moz-box-flex: 1; +} + +#noFxaGroup { + -moz-box-flex: 1; + margin: 0; +} + +#fxaContentWrapper { + padding-right: 15px; +} + +#noFxaGroup > vbox, +#fxaGroup { + -moz-box-align: start; +} + +#syncStatusMessage { + visibility: collapse; + opacity: 0; + transition: opacity 1s linear; + padding: 14px 8px 14px 14px; + border-radius: 2px; } -#fxaSyncComputerName.plain { - background-color: transparent; +#syncStatusMessage[message-type] { + visibility: visible; opacity: 1; } -/* === END shared/in-content/preferences.css === */ +#syncStatusMessage[message-type="verify-success"] { + background-color: #008484; +} + +#syncStatusMessage[message-type="verify-error"] { + background-color: #FF0000; +} + +#syncStatusMessage[message-type="migration"] { + background-color: #FF9F00; +} + +#syncStatusMessageWrapper { + -moz-box-flex: 1; + padding-right: 5px; +} + +#syncStatusMessageTitle, #syncStatusMessageDescription { + color: #9C9CFF; +} + +#syncStatusMessage[message-type="migration"] #syncStatusMessageTitle { + display: none; +} + +#syncStatusMessageTitle { + font-weight: bold !important; + font-size: 16px; + line-height: 157%; + margin: 0 0 20px; +} + +#syncStatusMessageDescription { + font-size: 14px; + line-height: 158%; + margin: 0 !important; +} + +#syncStatusMessageClose { + margin: 0px; +} + +#fxaSyncEngines > vbox:first-child { + margin-right: 80px; +} + +#fxaSyncComputerName { + margin-inline-start: 0px; + -moz-box-flex: 1; +} + +#tosPP-small-ToS { + margin-bottom: 14px; +} + +#noFxaCaption { + font-weight: bold; + margin-bottom: 11px; +} + +.fxaSyncIllustration { + margin-top: 35px; +} + +#syncOptions caption { + margin-bottom: 11px; +} + +#fxaDeviceName { + margin-bottom: 27.5px; +} + +#noFxaDescription { + margin-bottom: 20px !important; +} + +.separator { + border-bottom: 1px solid var(--in-content-header-border-color); +} + +.fxaAccountBox { + border: 1px solid #A09090; + border-radius: 5px; + padding: 14px 20px 14px 14px; +} + +#signedOutAccountBoxTitle { + font-weight: bold; +} + +.fxaAccountBoxButtons { + margin-bottom: 0 !important; + margin-top: 11px; +} + +.fxaAccountBoxButtons > * { + -moz-box-flex: 1; +} + +.fxaAccountBoxButtons > button { + text-align: center; + padding-left: 11px; + padding-right: 11px; + margin: 0; + min-width: 0; +} + +.fxaAccountBoxButtons > button:first-child { + margin-right: 14px !important; +} + +.fxaSyncIllustration { + width: 231px; + list-style-image: url(chrome://browser/skin/fxa/sync-illustration.png) +} + +#fxaEmailAddress1, +#fxaEmailAddress2, +#fxaEmailAddress3 { + word-break: break-all; +} + +.fxaFirefoxLogo { + list-style-image: url(chrome://browser/skin/fxa/logo.png); + max-width: 64px; + margin-inline-end: 14px; +} + +.fxaMobilePromo { + margin-bottom: 31px; +} + +#fxaLoginRejectedWarning { + list-style-image: url(chrome://browser/skin/warning.svg); + filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15)); + margin: 4px 8px 0px 0px; +} + +#syncOptions { + margin-bottom: 27.5px; +} + +.androidLink, +.iOSLink { + margin: 0; +} + +#tosPP-small { + margin-top: 20px; + margin-bottom: 20px; +} + +@media (min-resolution: 1.1dppx) { + .fxaSyncIllustration { + list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png) + } + .fxaFirefoxLogo { + list-style-image: url(chrome://browser/skin/fxa/logo@2x.png); + } + #fxaProfileImage { + list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png); + } +} + +/* === END shared/incontentprefs/preferences.inc.css === */ caption { }