aboutsummaryrefslogtreecommitdiff
path: root/arc-firefox-theme/chrome/browser/preferences
diff options
context:
space:
mode:
Diffstat (limited to 'arc-firefox-theme/chrome/browser/preferences')
-rw-r--r--arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css40
-rw-r--r--arc-firefox-theme/chrome/browser/preferences/in-content/icons.svg96
-rw-r--r--arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css224
3 files changed, 117 insertions, 243 deletions
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ viewBox="0 0 24 24">
<style>
use:not(:target) {
display: none;
@@ -16,32 +15,99 @@
fill: ThreeDHighlight;
}
</style>
- <defs>
+ <defs style="display: none;">
<g id="general-shape">
- <path d="M18.97,3H5.03C3.914,3,3,3.914,3,5.03v13.94C3,20.086,3.914,21,5.03,21H18.97c1.117,0,2.03-0.914,2.03-2.03 V5.03C21,3.914,20.086,3,18.97,3z M5.35,19.326c-0.404,0-0.731-0.327-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731 c0.404,0,0.731,0.327,0.731,0.731C6.081,19,5.754,19.326,5.35,19.326z M5.35,6.168c-0.403,0-0.731-0.328-0.731-0.731 c0-0.404,0.328-0.731,0.731-0.731c0.403,0,0.731,0.327,0.731,0.731C6.081,5.84,5.753,6.168,5.35,6.168z M15.243,14.035 c0,0.229-0.186,0.416-0.414,0.416c-0.229,0-0.415,0.186-0.415,0.414v3.347c0,0.228-0.185,0.384-0.414,0.384l-4.141,0.03 c-0.227,0-0.414-0.186-0.414-0.414v-3.347c0-0.228-0.185-0.414-0.414-0.414c-0.227,0-0.414-0.187-0.414-0.416V6.582 c0-0.229,0.187-0.414,0.414-0.414h5.798c0.228,0,0.414,0.185,0.414,0.414V14.035z M18.509,19.326c-0.404,0-0.731-0.327-0.731-0.731 c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731C19.24,19,18.913,19.326,18.509,19.326z M18.509,6.168 c-0.404,0-0.731-0.328-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731 C19.24,5.84,18.913,6.168,18.509,6.168z"/>
- <path d="M12.757,7.824h-1.657c-0.456,0-0.828,0.373-0.828,0.828v8.282c0,0.456,0.373,0.828,0.828,0.828h1.657 c0.456,0,0.828-0.373,0.828-0.828V8.652C13.586,8.196,13.213,7.824,12.757,7.824z"/>
+ <path
+ d="M18.97,3H5.03C3.914,3,3,3.914,3,5.03v13.94C3,20.086,3.914,21,5.03,21H18.97c1.117,0,2.03-0.914,2.03-2.03
+ V5.03C21,3.914,20.086,3,18.97,3z M5.35,19.326c-0.404,0-0.731-0.327-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731
+ c0.404,0,0.731,0.327,0.731,0.731C6.081,19,5.754,19.326,5.35,19.326z M5.35,6.168c-0.403,0-0.731-0.328-0.731-0.731
+ c0-0.404,0.328-0.731,0.731-0.731c0.403,0,0.731,0.327,0.731,0.731C6.081,5.84,5.753,6.168,5.35,6.168z M15.243,14.035
+ c0,0.229-0.186,0.416-0.414,0.416c-0.229,0-0.415,0.186-0.415,0.414v3.347c0,0.228-0.185,0.384-0.414,0.384l-4.141,0.03
+ c-0.227,0-0.414-0.186-0.414-0.414v-3.347c0-0.228-0.185-0.414-0.414-0.414c-0.227,0-0.414-0.187-0.414-0.416V6.582
+ c0-0.229,0.187-0.414,0.414-0.414h5.798c0.228,0,0.414,0.185,0.414,0.414V14.035z M18.509,19.326c-0.404,0-0.731-0.327-0.731-0.731
+ c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731C19.24,19,18.913,19.326,18.509,19.326z M18.509,6.168
+ c-0.404,0-0.731-0.328-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731
+ C19.24,5.84,18.913,6.168,18.509,6.168z"/>
+ <path
+ d="M12.757,7.824h-1.657c-0.456,0-0.828,0.373-0.828,0.828v8.282c0,0.456,0.373,0.828,0.828,0.828h1.657
+ c0.456,0,0.828-0.373,0.828-0.828V8.652C13.586,8.196,13.213,7.824,12.757,7.824z"/>
</g>
<g id="search-shape">
- <path d="M2,10.018c0,4.43,3.585,8.019,8.009,8.019 c1.603,0,3.095-0.473,4.348-1.285l4.806,4.81c0.58,0.583,1.523,0.583,2.105,0l0.296-0.297c0.582-0.583,0.582-1.527,0-2.11 l-4.808-4.814c0.8-1.247,1.265-2.73,1.265-4.323c0-4.43-3.587-8.018-8.012-8.018C5.585,2,2,5.589,2,10.018z M5.104,10.021 c0-2.716,2.196-4.915,4.906-4.915c2.71,0,4.908,2.199,4.908,4.915c0,2.712-2.198,4.911-4.908,4.911 C7.3,14.931,5.104,12.732,5.104,10.021z"/>
+ <path
+ d="M2,10.018c0,4.43,3.585,8.019,8.009,8.019
+ c1.603,0,3.095-0.473,4.348-1.285l4.806,4.81c0.58,0.583,1.523,0.583,2.105,0l0.296-0.297c0.582-0.583,0.582-1.527,0-2.11
+ l-4.808-4.814c0.8-1.247,1.265-2.73,1.265-4.323c0-4.43-3.587-8.018-8.012-8.018C5.585,2,2,5.589,2,10.018z M5.104,10.021
+ c0-2.716,2.196-4.915,4.906-4.915c2.71,0,4.908,2.199,4.908,4.915c0,2.712-2.198,4.911-4.908,4.911
+ C7.3,14.931,5.104,12.732,5.104,10.021z"/>
</g>
<g id="content-shape">
- <path d="M16.286,2H5.571C4.388,2,3.429,2.96,3.429,4.143v15.714 C3.429,21.04,4.388,22,5.571,22h12.857c1.185,0,2.143-0.96,2.143-2.143V6.286L16.286,2z M18.945,19.223c0,0.22-0.18,0.4-0.4,0.4 h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V19.223z M18.945,15.223 c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V15.223z M18.945,11.229c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2 c0.22,0,0.4,0.18,0.4,0.4V11.229z M14.833,7.707v-4.65l4.65,4.65H14.833z"/>
+ <path
+ d="M16.286,2H5.571C4.388,2,3.429,2.96,3.429,4.143v15.714
+ C3.429,21.04,4.388,22,5.571,22h12.857c1.185,0,2.143-0.96,2.143-2.143V6.286L16.286,2z M18.945,19.223c0,0.22-0.18,0.4-0.4,0.4
+ h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V19.223z M18.945,15.223
+ c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V15.223z
+ M18.945,11.229c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2
+ c0.22,0,0.4,0.18,0.4,0.4V11.229z M14.833,7.707v-4.65l4.65,4.65H14.833z"/>
</g>
<g id="applications-shape">
- <path d="M16.673,8.914C16.089,4.122,13.248,1,12,1c-1.25,0-3.986,3.122-4.767,7.914l-3.122,3.131v7.889h2.268 l2.978-3.436c0.28,0.29,0.737,1.666,1.065,1.858h3.155c0.331-0.193,0.789-1.569,1.068-1.858l3.123,3.436h2.12v-7.84L16.673,8.914z M12.042,8.735c-0.604,0-1.279,0.06-1.818,0.165c0.478-1.453,1.345-3.117,1.781-3.117c0.435,0,1.301,1.655,1.775,3.1 C13.265,8.789,12.615,8.735,12.042,8.735z M12.524,19.145c0.076,0.196,0.119,0.602,0.119,0.86c0,0.66-0.524,1.074-0.687,1.074 c-0.163,0-0.615-0.414-0.615-1.074c0-0.257,0.045-0.664,0.119-0.86h-0.754c-0.089,0.345-0.39,1.005-0.39,1.408 c0,1.458,1.328,2.447,1.686,2.447c0.359,0,1.686-0.951,1.686-2.407c0-0.404-0.301-1.103-0.388-1.449H12.524z"/>
+ <path
+ d="M16.673,8.914C16.089,4.122,13.248,1,12,1c-1.25,0-3.986,3.122-4.767,7.914l-3.122,3.131v7.889h2.268
+ l2.978-3.436c0.28,0.29,0.737,1.666,1.065,1.858h3.155c0.331-0.193,0.789-1.569,1.068-1.858l3.123,3.436h2.12v-7.84L16.673,8.914z
+ M12.042,8.735c-0.604,0-1.279,0.06-1.818,0.165c0.478-1.453,1.345-3.117,1.781-3.117c0.435,0,1.301,1.655,1.775,3.1
+ C13.265,8.789,12.615,8.735,12.042,8.735z M12.524,19.145c0.076,0.196,0.119,0.602,0.119,0.86c0,0.66-0.524,1.074-0.687,1.074
+ c-0.163,0-0.615-0.414-0.615-1.074c0-0.257,0.045-0.664,0.119-0.86h-0.754c-0.089,0.345-0.39,1.005-0.39,1.408
+ c0,1.458,1.328,2.447,1.686,2.447c0.359,0,1.686-0.951,1.686-2.407c0-0.404-0.301-1.103-0.388-1.449H12.524z"/>
</g>
<g id="privacy-shape">
- <path d="M21.632,9.541c-0.083,1.403,0.246,3.079-1.597,5.498 c-1.965,2.578-3.914,2.594-4.284,2.575c-2.249-0.117-2.502-1.875-3.792-1.875c-1.13,0-2.012,1.745-3.711,1.836 c-0.37,0.02-2.319,0.042-4.284-2.536c-1.841-2.419-1.514-4.095-1.597-5.498C2.287,8.138,2,6.618,2,6.618s0.887,0.895,2.033,0.973 C5.179,7.67,5.394,7.191,7.811,6.501C10.424,5.752,12,8.814,12,8.814s1.776-3.016,4.189-2.313c2.414,0.7,2.515,1.169,3.661,1.091 C20.996,7.513,22,6.618,22,6.618S21.713,8.138,21.632,9.541z M8.117,10.129c-1.429-0.314-2.028,0.223-2.642,0.451 c-0.534,0.202-1.02,0.264-1.02,0.264s0.083,0.819,1.515,1.521c1.432,0.703,4.37,0.338,4.37,0.338S10.651,10.687,8.117,10.129z M18.525,10.58c-0.612-0.228-1.212-0.765-2.642-0.451c-2.534,0.558-2.223,2.573-2.223,2.573s2.938,0.365,4.37-0.338 c1.432-0.702,1.515-1.521,1.515-1.521S19.059,10.782,18.525,10.58z"/>
+ <path
+ d="M21.632,9.541c-0.083,1.403,0.246,3.079-1.597,5.498
+ c-1.965,2.578-3.914,2.594-4.284,2.575c-2.249-0.117-2.502-1.875-3.792-1.875c-1.13,0-2.012,1.745-3.711,1.836
+ c-0.37,0.02-2.319,0.042-4.284-2.536c-1.841-2.419-1.514-4.095-1.597-5.498C2.287,8.138,2,6.618,2,6.618s0.887,0.895,2.033,0.973
+ C5.179,7.67,5.394,7.191,7.811,6.501C10.424,5.752,12,8.814,12,8.814s1.776-3.016,4.189-2.313c2.414,0.7,2.515,1.169,3.661,1.091
+ C20.996,7.513,22,6.618,22,6.618S21.713,8.138,21.632,9.541z M8.117,10.129c-1.429-0.314-2.028,0.223-2.642,0.451
+ c-0.534,0.202-1.02,0.264-1.02,0.264s0.083,0.819,1.515,1.521c1.432,0.703,4.37,0.338,4.37,0.338S10.651,10.687,8.117,10.129z
+ M18.525,10.58c-0.612-0.228-1.212-0.765-2.642-0.451c-2.534,0.558-2.223,2.573-2.223,2.573s2.938,0.365,4.37-0.338
+ c1.432-0.702,1.515-1.521,1.515-1.521S19.059,10.782,18.525,10.58z"/>
</g>
<g id="security-shape">
- <path d="M18.909,9.783h-0.863V8.086C18.046,4.725,15.339,2,12,2 C8.661,2,5.954,4.725,5.954,8.086v1.697H5.091c-0.955,0-1.728,0.779-1.728,1.739v8.738c0,0.961,0.773,1.74,1.728,1.74h13.818 c0.954,0,1.728-0.779,1.728-1.74v-8.738C20.637,10.562,19.863,9.783,18.909,9.783z M8.545,8.086c0-1.92,1.547-3.478,3.455-3.478 c1.908,0,3.455,1.557,3.455,3.478v1.697h-6.91V8.086z M5.181,16.092l-0.909-1.2v-2.284l2.728,3.483H5.181z M8.818,16.092 l-2.773-3.657h1.727l2.864,3.657H8.818z M12,16.092l-2.773-3.657h1.727l2.864,3.657H12z M15.637,16.092l-2.773-3.657h1.727 l2.864,3.657H15.637z M19.728,16.092h-0.455l-2.773-3.657h1.727l1.501,1.916V16.092z"/>
+ <path
+ d="M18.909,9.783h-0.863V8.086C18.046,4.725,15.339,2,12,2
+ C8.661,2,5.954,4.725,5.954,8.086v1.697H5.091c-0.955,0-1.728,0.779-1.728,1.739v8.738c0,0.961,0.773,1.74,1.728,1.74h13.818
+ c0.954,0,1.728-0.779,1.728-1.74v-8.738C20.637,10.562,19.863,9.783,18.909,9.783z M8.545,8.086c0-1.92,1.547-3.478,3.455-3.478
+ c1.908,0,3.455,1.557,3.455,3.478v1.697h-6.91V8.086z M5.181,16.092l-0.909-1.2v-2.284l2.728,3.483H5.181z M8.818,16.092
+ l-2.773-3.657h1.727l2.864,3.657H8.818z M12,16.092l-2.773-3.657h1.727l2.864,3.657H12z M15.637,16.092l-2.773-3.657h1.727
+ l2.864,3.657H15.637z M19.728,16.092h-0.455l-2.773-3.657h1.727l1.501,1.916V16.092z"/>
</g>
<g id="sync-shape">
- <path d="M17.024,3.351 c-0.562,0.331 -1.311,0.879 -1.821,1.698 -0.367,0.592 -0.752,1.288 -1.08,1.914 0.987,0.413 1.862,1.095 2.476,2.029 0.614,0.957 0.929,2.122 0.83,3.351 -0.201,1.787 -1.359,3.433 -3.046,4.36 -0.696,-0.774 -1.951,-2.945 -1.951,-2.945 -0.007,0.007 -0.004,2.556 -0.871,4.334 -0.573,1.184 -1.24,2.202 -2.305,2.995 1.431,0.51 2.915,0.886 4.282,0.909 l 0.162,0.002 c 2.99,0.021 5.844,-0.48 5.844,-0.48 0,0 -1.236,-0.802 -1.808,-1.346 1.86,-1.072 3.111,-2.791 3.634,-4.708 0.283,-0.759 0.478,-1.566 0.57,-2.409 C 22.383,9.011 20.33,5.278 17.024,3.351 Z M 6.569,12.302 C 6.526,10.271 7.755,8.327 9.644,7.29 c 0.696,0.774 2.32,2.899 2.32,2.899 0,0 -0.064,-5.157 1.657,-7.973 -6.097,-0.668 -9.69,0.443 -9.69,0.443 0,0 1.763,0.607 2.333,1.136 C 6.122,3.891 5.984,3.992 5.85,4.096 4.4,5.064 3.368,6.449 2.825,7.994 2.436,8.892 2.171,9.863 2.06,10.887 1.622,14.886 3.629,18.572 6.871,20.515 7.39,20.124 7.975,19.631 8.61,18.983 9.189,18.389 9.647,17.682 10.021,16.967 8.082,16.208 6.714,14.404 6.569,12.302 Z"/>
+ <path
+ d="M17.024,3.351 c-0.562,0.331 -1.311,0.879 -1.821,1.698 -0.367,0.592 -0.752,1.288 -1.08,1.914 0.987,0.413 1.862,1.095
+ 2.476,2.029 0.614,0.957 0.929,2.122 0.83,3.351 -0.201,1.787 -1.359,3.433 -3.046,4.36 -0.696,-0.774 -1.951,-2.945
+ -1.951,-2.945 -0.007,0.007 -0.004,2.556 -0.871,4.334 -0.573,1.184 -1.24,2.202 -2.305,2.995 1.431,0.51 2.915,0.886
+ 4.282,0.909 l 0.162,0.002 c 2.99,0.021 5.844,-0.48 5.844,-0.48 0,0 -1.236,-0.802 -1.808,-1.346 1.86,-1.072 3.111,-2.791
+ 3.634,-4.708 0.283,-0.759 0.478,-1.566 0.57,-2.409 C 22.383,9.011 20.33,5.278 17.024,3.351 Z M 6.569,12.302 C 6.526,10.271
+ 7.755,8.327 9.644,7.29 c 0.696,0.774 2.32,2.899 2.32,2.899 0,0 -0.064,-5.157 1.657,-7.973 -6.097,-0.668 -9.69,0.443
+ -9.69,0.443 0,0 1.763,0.607 2.333,1.136 C 6.122,3.891 5.984,3.992 5.85,4.096 4.4,5.064 3.368,6.449 2.825,7.994 2.436,8.892
+ 2.171,9.863 2.06,10.887 1.622,14.886 3.629,18.572 6.871,20.515 7.39,20.124 7.975,19.631 8.61,18.983 9.189,18.389 9.647,17.682
+ 10.021,16.967 8.082,16.208 6.714,14.404 6.569,12.302 Z"/>
</g>
<g id="advanced-shape">
- <path d="M19.173,16.163c0.004,0.04,0.007,0.08,0.007,0.121c0,1.748-3.197,3.165-7.14,3.165 c-3.943,0-7.14-1.417-7.14-3.165c0 -0.037,0.003-0.073,0.006-0.109C3.11,16.572,2,17.243,2,18.341C2,20.362,6.477,22,12,22 c5.523,0,10-1.638,10-3.659 C22,17.22,20.922,16.553,19.173,16.163z"/>
- <path d="M18.224,15.979c0.006-0.11-0.018-0.285-0.054-0.39c0,0-0.762-2.205-1.176-3.403 c-0.624-1.807-2.112-6.139-2.112-6.139c-0.036-0.104-0.031-0.273,0.01-0.376l0.497-1.234c0.041-0.102,0.116-0.266,0.166-0.364 l0.986-1.942c0.05-0.098,0.013-0.133-0.081-0.077L9.965,5.871c-0.095,0.056-0.203,0.186-0.24,0.29c0,0-0.252,0.7-0.412,1.144 C8.64,9.173,7.968,11.04,7.296,12.908c-0.26,0.723-0.52,1.446-0.78,2.168c-0.056,0.156-0.112,0.311-0.168,0.466 c-0.093,0.26-0.049,0.617,0.032,0.881c0.237,0.763,1.001,1.189,1.708,1.435c0.611,0.213,1.254,0.328,1.895,0.403 c0.895,0.105,1.805,0.14,2.706,0.112c1.356-0.041,2.767-0.261,4.004-0.846c0.429-0.203,0.854-0.459,1.174-0.816 c0.121-0.135,0.226-0.287,0.297-0.455C18.215,16.134,18.224,15.979,18.224,15.979z M14.063,16.131 c0.019,0.108-0.046,0.156-0.143,0.104l-1.466-0.772c-0.097-0.052-0.257-0.052-0.354,0l-1.466,0.773 c-0.097,0.052-0.162,0.004-0.143-0.104l0.28-1.636c0.019-0.109-0.031-0.261-0.109-0.338l-1.186-1.158 c-0.079-0.077-0.054-0.153,0.055-0.169l1.638-0.239c0.109-0.016,0.238-0.11,0.286-0.209l0.733-1.488 c0.049-0.099,0.128-0.099,0.177,0l0.733,1.488c0.049,0.099,0.178,0.193,0.286,0.209l1.639,0.239 c0.109,0.016,0.134,0.092,0.055,0.169l-1.186,1.158c-0.079,0.077-0.128,0.229-0.109,0.338L14.063,16.131z"/>
+ <path
+ d="M19.173,16.163c0.004,0.04,0.007,0.08,0.007,0.121c0,1.748-3.197,3.165-7.14,3.165 c-3.943,0-7.14-1.417-7.14-3.165c0
+ -0.037,0.003-0.073,0.006-0.109C3.11,16.572,2,17.243,2,18.341C2,20.362,6.477,22,12,22 c5.523,0,10-1.638,10-3.659
+ C22,17.22,20.922,16.553,19.173,16.163z"/>
+ <path
+ d="M18.224,15.979c0.006-0.11-0.018-0.285-0.054-0.39c0,0-0.762-2.205-1.176-3.403
+ c-0.624-1.807-2.112-6.139-2.112-6.139c-0.036-0.104-0.031-0.273,0.01-0.376l0.497-1.234c0.041-0.102,0.116-0.266,0.166-0.364
+ l0.986-1.942c0.05-0.098,0.013-0.133-0.081-0.077L9.965,5.871c-0.095,0.056-0.203,0.186-0.24,0.29c0,0-0.252,0.7-0.412,1.144
+ C8.64,9.173,7.968,11.04,7.296,12.908c-0.26,0.723-0.52,1.446-0.78,2.168c-0.056,0.156-0.112,0.311-0.168,0.466
+ c-0.093,0.26-0.049,0.617,0.032,0.881c0.237,0.763,1.001,1.189,1.708,1.435c0.611,0.213,1.254,0.328,1.895,0.403
+ c0.895,0.105,1.805,0.14,2.706,0.112c1.356-0.041,2.767-0.261,4.004-0.846c0.429-0.203,0.854-0.459,1.174-0.816
+ c0.121-0.135,0.226-0.287,0.297-0.455C18.215,16.134,18.224,15.979,18.224,15.979z M14.063,16.131
+ c0.019,0.108-0.046,0.156-0.143,0.104l-1.466-0.772c-0.097-0.052-0.257-0.052-0.354,0l-1.466,0.773
+ c-0.097,0.052-0.162,0.004-0.143-0.104l0.28-1.636c0.019-0.109-0.031-0.261-0.109-0.338l-1.186-1.158
+ c-0.079-0.077-0.054-0.153,0.055-0.169l1.638-0.239c0.109-0.016,0.238-0.11,0.286-0.209l0.733-1.488
+ c0.049-0.099,0.128-0.099,0.177,0l0.733,1.488c0.049,0.099,0.178,0.193,0.286,0.209l1.639,0.239
+ c0.109,0.016,0.134,0.092,0.055,0.169l-1.186,1.158c-0.079,0.077-0.128,0.229-0.109,0.338L14.063,16.131z"/>
</g>
</defs>
<use id="general" xlink:href="#general-shape"/>
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 {