aboutsummaryrefslogtreecommitdiff
path: root/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
diff options
context:
space:
mode:
authorHorst31802015-11-03 18:13:25 +0100
committerHorst31802015-11-03 18:13:25 +0100
commit77b3159c5482051456597da2d9eb051242db2251 (patch)
treef9e00578296fd6e87d45656b7ffbcaf7dafc6186 /arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
parent397d470525a48c0a866d7356f3d3a8016189e21f (diff)
parent9b4a293cbaf033f2c8f0a12a161f7b3ba7e84125 (diff)
downloadsolarc-firefox-theme-77b3159c5482051456597da2d9eb051242db2251.tar.gz
solarc-firefox-theme-77b3159c5482051456597da2d9eb051242db2251.tar.xz
solarc-firefox-theme-77b3159c5482051456597da2d9eb051242db2251.zip
Merge branch 'firefox-42-beta'42.2015110341.20151103
Diffstat (limited to 'arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css')
-rw-r--r--arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css219
1 files changed, 180 insertions, 39 deletions
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 28f5fc3..c83e0eb 100644
--- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
+++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
@@ -194,15 +194,23 @@ 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"]) > #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;
@@ -214,28 +222,6 @@ description > html|a {
cursor: pointer;
}
-#fxaProfileImage {
- width: 60px;
- height: 60px;
- border-radius: 50%;
- border-width: 5px;
- border-color: red;
- background-image: url(chrome://browser/skin/fxa/default-profile-image.svg);
- background-size: contain;
- cursor: pointer;
- -moz-margin-end: 15px;
-}
-
-#fxaProfileImage:hover {
- border-color: blue;
-}
-
-#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,
@@ -266,16 +252,8 @@ description > html|a {
-moz-margin-start: 33px;
}
-#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);
- }
+.text-link {
+ margin-bottom: 0;
}
#showUpdateHistory {
@@ -392,13 +370,176 @@ description > html|a {
* 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: 14px 0px;
+ 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;
}
-#fxaSyncComputerName.plain {
- background-color: transparent;
- opacity: 1;
+.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);
+ }
}
.treecol-sortdirection {