From a72e57d524f63f89e7746ca5135483ca5c019896 Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Thu, 23 Mar 2017 16:20:01 -0400 Subject: [PATCH] Bug 1350087 - Create a fork of the preferences styling and icons. r=mconley MozReview-Commit-ID: LqL4YXu42NJ --HG-- rename : browser/themes/linux/preferences/in-content/preferences.css => browser/themes/linux/preferences/in-content-old/preferences.css rename : browser/themes/osx/preferences/in-content/preferences.css => browser/themes/osx/preferences/in-content-old/preferences.css rename : browser/themes/shared/incontentprefs/containers.css => browser/themes/shared/incontentprefs-old/containers.css rename : browser/themes/shared/incontentprefs/dialog.inc.css => browser/themes/shared/incontentprefs-old/dialog.inc.css rename : browser/themes/shared/incontentprefs/favicon.ico => browser/themes/shared/incontentprefs-old/favicon.ico rename : browser/themes/shared/incontentprefs/icons.svg => browser/themes/shared/incontentprefs-old/icons.svg rename : browser/themes/shared/incontentprefs/preferences.inc.css => browser/themes/shared/incontentprefs-old/preferences.inc.css rename : browser/themes/shared/incontentprefs/search.css => browser/themes/shared/incontentprefs-old/search.css rename : browser/themes/windows/preferences/in-content/preferences.css => browser/themes/windows/preferences/in-content-old/preferences.css extra : rebase_source : 4016e42f5cd7831a1cac5061a5f7f9852fe1378f --- .../in-content-old/preferences.xul | 2 +- browser/installer/allowed-dupes.mn | 10 + browser/themes/linux/jar.mn | 1 + .../in-content-old/preferences.css | 48 ++ browser/themes/osx/jar.mn | 1 + .../in-content-old/preferences.css | 53 ++ .../shared/incontentprefs-old/containers.css | 32 + .../shared/incontentprefs-old/dialog.inc.css | 68 +++ .../shared/incontentprefs-old/favicon.ico | Bin 0 -> 933 bytes .../shared/incontentprefs-old/icons.svg | 63 ++ .../incontentprefs-old/preferences.inc.css | 566 ++++++++++++++++++ .../shared/incontentprefs-old/search.css | 49 ++ browser/themes/shared/jar.inc.mn | 4 + browser/themes/windows/jar.mn | 1 + .../in-content-old/preferences.css | 64 ++ 15 files changed, 961 insertions(+), 1 deletion(-) create mode 100644 browser/themes/linux/preferences/in-content-old/preferences.css create mode 100644 browser/themes/osx/preferences/in-content-old/preferences.css create mode 100644 browser/themes/shared/incontentprefs-old/containers.css create mode 100644 browser/themes/shared/incontentprefs-old/dialog.inc.css create mode 100644 browser/themes/shared/incontentprefs-old/favicon.ico create mode 100644 browser/themes/shared/incontentprefs-old/icons.svg create mode 100644 browser/themes/shared/incontentprefs-old/preferences.inc.css create mode 100644 browser/themes/shared/incontentprefs-old/search.css create mode 100644 browser/themes/windows/preferences/in-content-old/preferences.css diff --git a/browser/components/preferences/in-content-old/preferences.xul b/browser/components/preferences/in-content-old/preferences.xul index 806c9df15d9a..4e9eea716966 100644 --- a/browser/components/preferences/in-content-old/preferences.xul +++ b/browser/components/preferences/in-content-old/preferences.xul @@ -8,7 +8,7 @@ + href="chrome://browser/skin/preferences/in-content-old/preferences.css"?> diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index 778489bda016..a4dc0ec665c5 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -57,6 +57,16 @@ browser/chrome/en-US/locale/browser/preferences/sync.dtd browser/chrome/en-US/locale/browser/preferences/privacy.dtd browser/chrome/en-US/locale/browser/preferences/advanced.dtd browser/chrome/en-US/locale/browser/preferences/preferences.properties +browser/chrome/browser/skin/classic/browser/preferences/in-content-old/search.css +browser/chrome/browser/skin/classic/browser/preferences/in-content-old/containers.css +browser/chrome/browser/skin/classic/browser/preferences/in-content-old/favicon.ico +browser/chrome/browser/skin/classic/browser/preferences/in-content-old/icons.svg +browser/chrome/browser/skin/classic/browser/preferences/in-content-old/preferences.css +browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css +browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css +browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico +browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg +browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css # browser branding / themes is bug 1313106 browser/chrome/browser/content/branding/icon128.png browser/chrome/browser/content/branding/icon16.png diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index c9ffd21ad0f2..5d1e2bac8a7b 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -73,6 +73,7 @@ browser.jar: skin/classic/browser/places/downloads.png (places/downloads.png) skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png) skin/classic/browser/preferences/preferences.css (preferences/preferences.css) +* skin/classic/browser/preferences/in-content-old/preferences.css (preferences/in-content-old/preferences.css) * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) diff --git a/browser/themes/linux/preferences/in-content-old/preferences.css b/browser/themes/linux/preferences/in-content-old/preferences.css new file mode 100644 index 000000000000..6442458e00a3 --- /dev/null +++ b/browser/themes/linux/preferences/in-content-old/preferences.css @@ -0,0 +1,48 @@ +/* - 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/. */ + +%include ../../../shared/incontentprefs-old/preferences.inc.css + +.treecol-sortdirection { + /* override the Linux only toolkit rule */ + -moz-appearance: none; +} + +.actionsMenu { + font-family: "Clear Sans", sans-serif; + font-size: 1.25rem; + line-height: 22px; +} + +.actionsMenu > .menulist-label-box > .menulist-icon { + margin-top: 1px; + margin-inline-start: 1px; + margin-inline-end: 6px; +} + +.actionsMenu > .menulist-label-box > .menulist-label { + margin-top: 2px !important; +} + +#fxaProfileImage { + -moz-user-focus: normal; +} + +menulist.actionsMenu > .menulist-dropmarker { + margin-top: 11px; + margin-bottom: 11px; +} + +textbox + button, +filefield + button { + margin-inline-start: -4px; +} + +/** + * Dialog + */ + +#dialogTitle { + font-size: 1em; +} diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 7431f03ecc21..a90db2019b50 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -112,6 +112,7 @@ browser.jar: skin/classic/browser/preferences/application.png (preferences/application.png) skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) * skin/classic/browser/preferences/preferences.css (preferences/preferences.css) +* skin/classic/browser/preferences/in-content-old/preferences.css (preferences/in-content-old/preferences.css) * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) diff --git a/browser/themes/osx/preferences/in-content-old/preferences.css b/browser/themes/osx/preferences/in-content-old/preferences.css new file mode 100644 index 000000000000..03ca71842867 --- /dev/null +++ b/browser/themes/osx/preferences/in-content-old/preferences.css @@ -0,0 +1,53 @@ +/* - 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/. */ + +%include ../../../shared/incontentprefs-old/preferences.inc.css + +prefpane .groupbox-title { + background: none; + margin-bottom: 0; +} + +.actionsMenu > .menulist-label-box > .menulist-icon { + margin-top: 2px; + margin-inline-start: 2px; + margin-inline-end: 8px !important; +} + +#downloadFolder > .fileFieldContentBox { + padding-inline-start: 3px; +} + +#fxaProfileImage { + -moz-user-focus: normal; +} + +textbox + button { + margin-inline-start: -4px; +} + +filefield + button { + margin-inline-start: -8px; +} + +#popupPolicyRow { + /* Override styles from + browser/themes/osx/preferences/preferences.css */ + margin-bottom: 0 !important; + padding-bottom: 0 !important; + border-bottom: none; +} + +#advancedPrefs { + margin-right: 0; /*override margin from normal preferences.css */ + margin-left: 0; +} + +/** + * Dialog + */ + +#dialogTitle { + font-size: 1.1em; +} diff --git a/browser/themes/shared/incontentprefs-old/containers.css b/browser/themes/shared/incontentprefs-old/containers.css new file mode 100644 index 000000000000..5446dccce287 --- /dev/null +++ b/browser/themes/shared/incontentprefs-old/containers.css @@ -0,0 +1,32 @@ +/* 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/. */ + +%include ../../../components/contextualidentity/content/usercontext.css + +.container-header-links { + margin-block-end: 15px; +} + +[data-identity-icon] { + margin: 0; + margin-inline-end: 16px; +} + +#containersView { + border: 0 none; + background: transparent; +} + +#containersView richlistitem { + margin: 0px; + margin-inline-end: 8px; + padding: 0; + padding-block-end: 8px; + border-block-end: 1px solid var(--in-content-header-border-color); +} + +#containersView richlistitem:last-of-type { + border-block-end: 0 none; + margin-block-end: 8px; +} diff --git a/browser/themes/shared/incontentprefs-old/dialog.inc.css b/browser/themes/shared/incontentprefs-old/dialog.inc.css new file mode 100644 index 000000000000..27de416ab5ad --- /dev/null +++ b/browser/themes/shared/incontentprefs-old/dialog.inc.css @@ -0,0 +1,68 @@ +%if 0 +/* - 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/. */ +%endif + +dialog, +window, +prefpane, +prefwindow, +.windowDialog { + -moz-appearance: none; + background-color: #fbfbfb; + color: #424e5a; + margin: 0; + padding: 0; +} + +.contentPane { + margin: 0; +} + +tabbox { + /* override the rule in certManager.xul */ + margin: 0 0 5px !important; +} + +tabpanels { + font-size: 1em; +} + +tabs, +label, +description, +#useDocumentColors { + margin-right: 4px; + margin-left: 4px; +} + +tree:not(#rejectsTree) { + min-height: 15em; +} + +.actionButtons { + margin: 3px 0 0 !important; +} + +caption { + padding-inline-start: 0; +} + +groupbox { + font-size: 1em; + margin-top: 0; + margin-right: 4px; + margin-left: 4px; + padding-top: 0; + padding-bottom: 5px; +} + +prefpane .groupbox-body { + padding: 0 0 5px; +} + +groupbox description { + margin-right: 0; + margin-left: 0; +} diff --git a/browser/themes/shared/incontentprefs-old/favicon.ico b/browser/themes/shared/incontentprefs-old/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..4d07d2b5d47327c5b8854298f782db4c7ba1e162 GIT binary patch literal 933 zcmZQzU}Ruo5D;Jh19L_O1~ni{K>@<|U}9j11&VbB___0PNpS&1c|AQ`f`BwghX4l~ zkd*)YKM_d%^K@|xu{b?@1quH$?p5&{GK5&&Fc-L!h|J zRcG3&jf@wk9?^Z_;QU#9!*4N*1B<`2Tv?;!F0Hy`c4p7PMy;t2Y&YCk@R_xuX|Lf5 zwje!JSu zzdJjp8s50LQAD_ZFVdQ&MBb@ORy;br4_)zR$Nu}g@J*I z9~5jAx3*rl_l^#fI9`~{%^1j(q|JBqqV86|MM^uYwiid=cVK#%R4AZcxayI$fa8U- zNg}OQQ3V@cp7rjSeAUfB;?Lyc?+e-vAAW0TzWn$@@D1zmYv#SD6!gs^U~6_5$1`E?2N2^0ViS_3IvN!tUQ`M!D0C>miq6B z4sV!bB%HXLtn8HfYfsd#QffEMc_cNxB2#>Y!xU`~mHi5*)OS1BCS)*IyD2~Tqq4<; z`~B6ulZ=l?P3XB*)|j|v5oh6!!)qRQ&NP+$XmM~)L7&`(_m$7~SI9>j^?fck$b5d8 zt;d3`rAEi~dS%o~NpWBc=$FX4pljw17 zm7f1c!!~m7IiR|3W2fPh54MLM{XUV*So+$C?`z4 zNzC3w@!GNy>je&$KuRFj^pAes<2xQ77X1Iak!y8D uVv7�t%jdTDWl2(g^d1BKsCKO1kF>Zojd$$ge*})GsaV(b?I^=?DPwevAD8 literal 0 HcmV?d00001 diff --git a/browser/themes/shared/incontentprefs-old/icons.svg b/browser/themes/shared/incontentprefs-old/icons.svg new file mode 100644 index 000000000000..2d0b671552e0 --- /dev/null +++ b/browser/themes/shared/incontentprefs-old/icons.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/browser/themes/shared/incontentprefs-old/preferences.inc.css b/browser/themes/shared/incontentprefs-old/preferences.inc.css new file mode 100644 index 000000000000..5c82303cf603 --- /dev/null +++ b/browser/themes/shared/incontentprefs-old/preferences.inc.css @@ -0,0 +1,566 @@ +%if 0 +/* - 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/. */ +%endif +@namespace html "http://www.w3.org/1999/xhtml"; + +#mainPrefPane { + max-width: 800px; + padding: 0; + font: message-box; + font-size: 1.25rem; +} + +* { + -moz-user-select: text; +} + +button, +treecol { + /* override the * rule */ + -moz-user-select: none; +} + +#engineList treechildren::-moz-tree-image(engineShown, checked), +#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check"); + width: 21px; + height: 21px; +} + +#engineList treechildren::-moz-tree-image(engineShown, checked, selected), +#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked, selected) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); +} + +#engineList treechildren::-moz-tree-row, +#blocklistsTree treechildren::-moz-tree-row { + min-height: 36px; +} + +#selectionCol { + min-width: 26px; +} + +.learnMore { + margin-inline-start: 10px; + font-weight: normal; + white-space: nowrap; +} + +/* Category List */ + +#categories { + max-height: 100vh; +} + +#categories > scrollbox { + overflow-x: hidden !important; +} + +/** + * We want the last category to always have non-0 getBoundingClientRect().bottom + * so we can use the value to figure out the max-height of the list in + * preferences.js, so use collapse instead of display: none; if it's hidden + */ +#categories > .category[hidden="true"] { + display: -moz-box; + visibility: collapse; +} + +#category-general > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#general"); +} + +#category-search > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#search"); +} + +#category-content > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#content"); +} + +#category-application > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#applications"); +} + +#category-privacy > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#privacy"); +} + +#category-security > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#security"); +} + +#category-sync > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#sync"); +} + +#category-advanced > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#advanced"); +} + +@media (max-width: 800px) { + .category-name { + display: none; + } +} + +/* header */ +.header { + display: flex; + align-items: center; + justify-content: space-between; +} + +.header[hidden=true] { + display: none; +} + +#header-advanced { + border-bottom: none; + padding-bottom: 0; +} + +/* General Pane */ + +#startupTable { + border-collapse: collapse; +} + +#startupTable > tr > td { + padding: 0; /* remove the padding from html.css */ +} + +#startupTable > tr:not(:first-child) > td { + padding-top: 0.5em; /* add a spacing between the rows */ +} + +#startupTable > tr > .label-cell { + text-align: end; + width: 0; /* make the column as small as possible */ +} + +#startupTable > tr > .label-cell > label { + white-space: nowrap; +} + +#startupTable > tr > .content-cell > menulist, +#startupTable > tr > .content-cell > textbox { + width: calc(100% - 8px); + margin-left: 4px; + margin-right: 4px; +} + +#startupTable > tr > .homepage-buttons { + display: flex; + flex-wrap: wrap; +} + +#startupTable > tr > .homepage-buttons > .content-cell-item { + flex-grow: 1; +} + +#useFirefoxSync { + font-size: 90%; + margin-inline-end: 8px !important; +} + +#getStarted { + font-size: 90%; +} + +#isNotDefaultLabel { + font-weight: bold; +} + +#downloadFolder { + margin-inline-start: 0; +} + +#browserHomePage:-moz-locale-dir(rtl) input { + unicode-bidi: plaintext; + direction: rtl; +} + +/* Content pane */ + +#defaultFontSizeLabel { + /* !important needed to override common !important rule */ + margin-inline-start: 4px !important; +} + +/* Applications Pane Styles */ + +#applicationsContent { + padding: 15px 0; +} + +#filter { + margin-inline-start: 0; +} + +#handlersView { + height: 25em; +} + +#handlersView > richlistitem { + min-height: 36px !important; +} + +.typeIcon { + margin-inline-start: 10px !important; + margin-inline-end: 9px !important; +} + +.actionIcon { + margin-inline-start: 11px !important; + margin-inline-end: 8px !important; +} + +.actionsMenu { + min-height: 36px; +} + +.actionsMenu > menupopup > menuitem { + padding-inline-start: 10px !important; +} + +.actionsMenu > menupopup > menuitem > .menu-iconic-left { + margin-inline-end: 8px !important; +} + +/* Privacy pane */ + +.doNotTrackLearnMore { + margin-inline-start: calc(1em + 30px); + margin-bottom: 1em; + font-weight: normal; +} + +.doNotTrackLearnMore > label { + font-size: 1em !important; + margin-left: 0; +} + +/* Collapse the non-active vboxes in decks to use only the height the + active vbox needs */ +#historyPane:not([selectedIndex="1"]) > #historyDontRememberPane, +#historyPane:not([selectedIndex="2"]) > #historyCustomPane, +#weavePrefsDeck:not([selectedIndex="1"]) > #hasFxaAccount, +#fxaLoginStatus:not([selectedIndex="1"]) > #fxaLoginUnverified, +#fxaLoginStatus:not([selectedIndex="2"]) > #fxaLoginRejected { + visibility: collapse; +} + +/* XXX This style is for bug 740213 and should be removed once that + bug has a solution. */ +description > html|a { + cursor: pointer; +} + +#weavePrefsDeck > vbox > label, +#weavePrefsDeck > vbox > groupbox, +#weavePrefsDeck > vbox > description, +#weavePrefsDeck > #hasFxaAccount > vbox > label, +#weavePrefsDeck > #hasFxaAccount > hbox > label { + /* no margin-inline-start for elements at the beginning of a line */ + margin-inline-start: 0; +} + +#tabsElement { + margin-inline-end: 4px; /* add the 4px end-margin of other elements */ +} + +.indent { + /* !important needed to override margin-inline-start:0 !important; rule + define in common.css for labels */ + margin-inline-start: 33px !important; +} + +.text-link { + margin-bottom: 0; +} + +#showUpdateHistory { + margin-inline-start: 0; +} + +/** + * Dialog + */ + +#dialogOverlay { + background-color: rgba(0,0,0,0.5); + visibility: hidden; +} + +#dialogBox { + background-color: #fbfbfb; + background-clip: content-box; + color: #424e5a; + font-size: 14px; + /* `transparent` will use the dialogText color in high-contrast themes and + when page colors are disabled */ + border: 1px solid transparent; + border-radius: 3.5px; + box-shadow: 0 2px 6px 0 rgba(0,0,0,0.3); + display: -moz-box; + margin: 0; + padding: 0; +} + +#dialogBox[resizable="true"] { + resize: both; + overflow: hidden; + min-height: 20em; + min-width: 66ch; +} + +#dialogBox > .groupbox-title { + padding: 3.5px 0; + background-color: #F1F1F1; + border-bottom: 1px solid #C1C1C1; +} + +#dialogTitle { + text-align: center; + -moz-user-select: none; +} + +.close-icon { + background-color: transparent !important; + border: none; + box-shadow: none; + padding: 0; + height: auto; + min-height: 16px; + min-width: 0; +} + +#dialogBox > .groupbox-body { + -moz-appearance: none; + padding: 20px; +} + +#dialogFrame { + -moz-box-flex: 1; + /* Default dialog dimensions */ + width: 66ch; +} + +.largeDialogContainer.doScroll { + overflow-y: auto; + -moz-box-flex: 1; +} + +/** + * End Dialog + */ + +/** + * Font dialog menulist fixes + */ + +#defaultFontType, +#serif, +#sans-serif, +#monospace { + min-width: 30ch; +} + +/** + * Sync + */ + +#fxaProfileImage { + max-width: 60px; + border-radius: 50%; + list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg); + margin-inline-end: 15px; + image-rendering: -moz-crisp-edges; +} + +#fxaLoginStatus[hasName] #fxaProfileImage { + max-width: 80px; +} + +#fxaProfileImage.actionable { + cursor: pointer; +} + +#fxaProfileImage.actionable:hover { + box-shadow: 0px 0px 0px 1px #0095DD; +} + +#fxaProfileImage.actionable:hover:active { + box-shadow: 0px 0px 0px 1px #ff9500; +} + +#noFxaAccount { + 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; +} + +#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 #D1D2D3; + border-radius: 5px; + padding: 14px 20px 14px 14px; +} + +#signedOutAccountBoxTitle { + font-weight: bold; +} + +.fxaAccountBoxButtons { + margin-bottom: 0 !important; + margin-top: 11px; + display: flex; + align-items: center; +} + +.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-inline-end: 14px !important; +} + +#verifiedManage:visited { + color: var(--in-content-link-color); +} + +.fxaSyncIllustration { + width: 231px; +} + +#fxaLoginStatus[hasName] #fxaEmailAddress1 { + font-size: 1.1rem; +} + +#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: 20px; + margin-top: 25px; +} + +#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 { + background-image: url("chrome://browser/skin/fxa/android.png"); +} + +.iOSLink { + background-image: url("chrome://browser/skin/fxa/ios.png"); +} + +.androidLink, +.iOSLink { + margin: 0 0 0 2px; + padding-left: 28px; + padding-top: 6px; + height: 28px; + background-repeat: no-repeat; + background-size: 24px 28px; +} + +#tosPP-small { + margin-top: 20px; + margin-bottom: 20px; +} + +@media (min-resolution: 1.1dppx) { + .androidLink { + background-image: url("chrome://browser/skin/fxa/android@2x.png"); + } + .iOSLink { + background-image: url("chrome://browser/skin/fxa/ios@2x.png"); + } + .fxaFirefoxLogo { + list-style-image: url(chrome://browser/skin/fxa/logo@2x.png); + } +} diff --git a/browser/themes/shared/incontentprefs-old/search.css b/browser/themes/shared/incontentprefs-old/search.css new file mode 100644 index 000000000000..f3c206b41dda --- /dev/null +++ b/browser/themes/shared/incontentprefs-old/search.css @@ -0,0 +1,49 @@ +/* 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/. */ + + #defaultEngine { + margin-inline-start: 0; + } + +#defaultEngine > .menulist-label-box > .menulist-icon { + height: 16px; +} + +/* work around a display: none in Linux's menu.css, see bug 1112310 */ +.searchengine-menuitem > .menu-iconic-left { + display: -moz-box; +} + +#engineList { + margin: .5em 0; +} + +#engineList treechildren::-moz-tree-image(engineName) { + margin-inline-end: 10px; + margin-inline-start: 1px; + width: 16px; + height: 16px; +} + +#engineList treechildren::-moz-tree-drop-feedback { + background-color: Highlight; + width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window + we may have, overflow isn't visible. */ + height: 2px; + margin-inline-start: 0; +} + +#engineShown { + min-width: 26px; +} + +#addEnginesBox { + margin-bottom: 1em; +} + +#removeEngineButton, +#restoreDefaultSearchEngines { + margin-right: 0; + margin-left: 0; +} diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 80fb7db4a655..0330f6f2fdb5 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -76,6 +76,10 @@ skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) skin/classic/browser/preferences/in-content/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css) * skin/classic/browser/preferences/in-content/containers.css (../shared/incontentprefs/containers.css) + skin/classic/browser/preferences/in-content-old/favicon.ico (../shared/incontentprefs-old/favicon.ico) + skin/classic/browser/preferences/in-content-old/icons.svg (../shared/incontentprefs-old/icons.svg) + skin/classic/browser/preferences/in-content-old/search.css (../shared/incontentprefs-old/search.css) +* skin/classic/browser/preferences/in-content-old/containers.css (../shared/incontentprefs-old/containers.css) * skin/classic/browser/preferences/containers.css (../shared/preferences/containers.css) skin/classic/browser/fxa/default-avatar.svg (../shared/fxa/default-avatar.svg) skin/classic/browser/fxa/logo.png (../shared/fxa/logo.png) diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index c94b0d559ae4..5530a5926d27 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -97,6 +97,7 @@ browser.jar: skin/classic/browser/preferences/application.png (preferences/application.png) skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) skin/classic/browser/preferences/preferences.css (preferences/preferences.css) +* skin/classic/browser/preferences/in-content-old/preferences.css (preferences/in-content-old/preferences.css) * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) diff --git a/browser/themes/windows/preferences/in-content-old/preferences.css b/browser/themes/windows/preferences/in-content-old/preferences.css new file mode 100644 index 000000000000..6be7daa293af --- /dev/null +++ b/browser/themes/windows/preferences/in-content-old/preferences.css @@ -0,0 +1,64 @@ +/* - 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/. */ + +%include ../../../shared/incontentprefs-old/preferences.inc.css + +@media (-moz-windows-default-theme: 0) { + #category-general > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#general-native"); + } + + #category-search > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#search-native"); + } + + #category-content > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#content-native"); + } + + #category-application > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#applications-native"); + } + + #category-privacy > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#privacy-native"); + } + + #category-security > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#security-native"); + } + + #category-sync > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#sync-native"); + } + + #category-advanced > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#advanced-native"); + } +} + +.actionsMenu > .menulist-label-box > .menulist-icon { + margin-inline-end: 9px; +} + +textbox + button, +filefield + button { + margin-inline-start: -4px; +} + +#advancedPrefs { + padding-bottom: 0; /* override padding from normal preferences.css */ +} + +#fxaProfileImage { + -moz-user-focus: normal; +} + +/** + * Dialog + */ + +#dialogTitle { + font-size: 1em; +}