From 3ae0c90209c4aeacc3f8a7958e943361097a272d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 21 Oct 2015 21:18:30 +0200 Subject: add support for Firefox 38 esr --- .../browser/preferences/aboutPermissions.css | 40 +--- .../browser/preferences/in-content/icons.svg | 96 +++++++-- .../browser/preferences/in-content/preferences.css | 224 +++------------------ 3 files changed, 117 insertions(+), 243 deletions(-) (limited to 'arc-firefox-theme/chrome/browser/preferences') diff --git a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css index 16d0aee..94549d8 100644 --- a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css +++ b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css @@ -2,16 +2,13 @@ * 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/. */ -@import url("chrome://global/skin/in-content/common.css"); +@import url("chrome://global/skin/inContentUI.css"); -#permissions-content { - padding-top: 48px; - -moz-padding-end: 0; /* no padding to move the scroll bar to the edge */ -} /* sites box */ #sites-box { + padding: 10px; width: 25em; } @@ -42,17 +39,13 @@ /* permissions box */ #permissions-box { - -moz-padding-start: 10px; -} - -#permissions-list { + padding-top: 10px; overflow-y: auto; - padding-top: 5px; - -moz-padding-end: 44px; } #site-description { font-size: 125%; + -moz-margin-start: 6px; /* to match button margin */ } #site-label { @@ -64,15 +57,7 @@ #defaults-description { font-size: 125%; font-weight: bold; -} - -#header-deck { - -moz-margin-end: 44px; -} - -#site-header, -#defaults-header { - margin-bottom: 1px; + -moz-margin-start: 6px; } .pref-item { @@ -94,9 +79,6 @@ .pref-icon[type="geo"] { list-style-image: url(chrome://browser/skin/Geolocation-64.png); } -.pref-icon[type="push"] { - list-style-image: url(chrome://browser/skin/Push-64.png); -} .pref-icon[type="indexedDB"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } @@ -112,6 +94,9 @@ .pref-icon[type="plugins"] { list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png); } +.pref-icon[type="fullscreen"] { + list-style-image: url(chrome://global/skin/icons/question-64.png); +} .pref-icon[type="camera"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } @@ -121,16 +106,11 @@ .pref-title { font-size: 125%; - -moz-margin-start: 4px; margin-bottom: 0; font-weight: bold; } .pref-menulist { - min-width: 10em; - } - -#cookies-label, -#passwords-label { - -moz-margin-start: 4px; /* align with the menulists */ + margin-left: 6px; + margin-right: 6px; } diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/icons.svg b/arc-firefox-theme/chrome/browser/preferences/in-content/icons.svg index 2d0b671..b74eb6d 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/icons.svg +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/icons.svg @@ -1,8 +1,7 @@ - - + - + - - + + - + - + - + - + - + - + - - + + diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css index c83e0eb..216826d 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css @@ -9,6 +9,7 @@ padding: 0; font: message-box; font-size: 1.25rem; + line-height: 22px; } * { @@ -149,11 +150,6 @@ treecol { margin-right: 4px !important; } -#defaultFontSizeLabel { - /* !important needed to override common !important rule */ - -moz-margin-start: 4px !important; -} - /* Applications Pane Styles */ #applicationsContent { @@ -194,23 +190,15 @@ treecol { -moz-margin-end: 8px !important; } -/* Privacy pane */ - -#doNotTrackInfo, -#trackingProtectionPBMLearnMore, -#trackingProtectionLearnMore { - -moz-margin-start: 1.5em !important; - margin-top: 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"]) > #hasAccount, #weavePrefsDeck:not([selectedIndex="2"]) > #needsUpdate, -#weavePrefsDeck:not([selectedIndex="3"]) > #noFxaAccount, -#weavePrefsDeck:not([selectedIndex="4"]) > #hasFxaAccount, +#weavePrefsDeck:not([selectedIndex="3"]) > #fxaDeterminingStatus, +#weavePrefsDeck:not([selectedIndex="4"]) > #noFxaAccount, +#weavePrefsDeck:not([selectedIndex="5"]) > #hasFxaAccount, #fxaLoginStatus:not([selectedIndex="1"]) > #fxaLoginUnverified, #fxaLoginStatus:not([selectedIndex="2"]) > #fxaLoginRejected { visibility: collapse; @@ -222,13 +210,19 @@ description > html|a { cursor: pointer; } +#noFxaAccount { + /* Overriding the margins from the base preferences.css theme file. + These overrides can be simplified by fixing bug 1027174 */ + margin: 0; +} + #weavePrefsDeck > vbox > label, #weavePrefsDeck > vbox > groupbox, #weavePrefsDeck > vbox > description, #weavePrefsDeck > vbox > #pairDevice > label, #weavePrefsDeck > #needsUpdate > hbox > #loginError, -#weavePrefsDeck > #hasFxaAccount > vbox > label, -#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label { +#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label, +#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-small) > label { /* no margin-start for elements at the begin of a line */ -moz-margin-start: 0; } @@ -252,8 +246,16 @@ description > html|a { -moz-margin-start: 33px; } -.text-link { - margin-bottom: 0; +#trackingProtectionImage { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/bad-content-blocked-16.png); +} + +@media (min-resolution: 2dppx) { + #trackingProtectionImage { + list-style-image: url(chrome://browser/skin/bad-content-blocked-16@2x.png); + } } #showUpdateHistory { @@ -299,17 +301,15 @@ description > html|a { #dialogTitle { text-align: center; - -moz-user-select: none; } .close-icon { background-color: transparent !important; border: none; box-shadow: none; + height: 18px; padding: 0; - height: auto; - min-height: 16px; - min-width: 0; + min-width: 18px; } #dialogBox > .groupbox-body { @@ -366,180 +366,8 @@ description > html|a { to { opacity: 1; } } -/** - * Sync - */ - -#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 { - box-shadow: 0px 0px 0px 1px #0095DD; -} - -#fxaProfileImage.actionable:hover:active { - box-shadow: 0px 0px 0px 1px #ff9500; -} - -#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; -} - -#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 { - margin-inline-start: 6px !important; - font-weight: bold; -} - -.fxaAccountBoxButtons { - margin-bottom: 0 !important; - margin-top: 11px; -} - -.fxaAccountBoxButtons > button { - padding-left: 11px; - padding-right: 11px; -} - -.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-top: 14px; - margin-bottom: 41px; -} - -#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; -} - -.androidLogo { - list-style-image: url(chrome://browser/skin/fxa/android.png); - max-width: 24px; - position: relative; - top: 8px; - margin: 0px; - margin-inline-end: 5px; -} - -.androidLink { - margin: 0; -} - -#tosPP-small { - margin-bottom: 20px; -} - -.androidAttribution { - font-size: 12px; - color: #D1D2D3; -} - -@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); - } - .androidLogo { - list-style-image: url(chrome://browser/skin/fxa/android@2x.png); - } - #fxaProfileImage { - list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png); - } +spinbuttons { + -moz-appearance: none; } .treecol-sortdirection { -- cgit v1.2.3