third part of syncing LCARStrek with Firefox 38 windows theme changes

diff --git a/LCARStrek/browser/aboutSessionRestore.css b/LCARStrek/browser/aboutSessionRestore.css
index c6db997567a30f30b3efbd2f13341605ea94778d..9efe8d3d300b7d5e4ea158822ca9d9d9016c62bb 100644 (file)
--- a/LCARStrek/browser/aboutSessionRestore.css
+++ b/LCARStrek/browser/aboutSessionRestore.css
@@ -9,7 +9,7 @@
 treechildren::-moz-tree-image(icon),
 treechildren::-moz-tree-image(noicon) {
   padding-right: 2px;
-  margin: 0px 2px;
+  margin: 0 2px;
   width: 16px;
   height: 16px;
 }

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 2d5f38cd0a89dd0fb699114b4063f7274c96c84b..549258440ca4c793ccfca442cd16f4304a04ff94 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -2839,12 +2839,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   color: #000000;
 }
 
-/* Handle a case where the last separator in a customized tab bar with a
-   separated new tab button causes the width of the tab to extend and causes
-   jittering with a small tab curve width (Bug 1111091). */
-#TabsToolbar[currentset]:not([currentset*="tabbrowser-tabs,new-tab-button"]) #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
-}
-
 /* New tab button */
 
 .tabs-newtab-button {
@@ -3526,6 +3520,18 @@ notification[value="translation"] {
   -moz-appearance: none;
 }
 
+/* Loop/ Hello browser styles */
+
+notification[value="loop-sharing-notification"] .button-menubutton-button {
+  min-width: 0;
+  border: 0;
+  margin: 0;
+}
+
+notification[value="loop-sharing-notification"] .messageImage {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
+}
+
 /* Bookmarks roots menu-items */
 #subscribeToPageMenuitem:not([disabled]),
 #subscribeToPageMenupopup,
@@ -4758,6 +4764,17 @@ notification.pluginVulnerable .messageImage {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed");
 }
 
+#eme-notification-icon[firstplay=true] {
+  animation: emeTeachingMoment 0.2s linear 0s 5 normal;
+}
+
+@keyframes emeTeachingMoment {
+  0% {transform: translateX(0); }
+  25% {transform: translateX(3px) }
+  75% {transform: translateX(-3px) }
+  100% { transform: translateX(0); }
+}
+
 /* === BEGIN customizeMode.inc.css === */
 
 /* Customization mode */
@@ -5483,54 +5500,6 @@ toolbarpaletteitem[place="toolbar"] {
   color: #000000;
 }
 
-.SearchHighlight {
-  -moz-margin-end: 6px;
-  font-size: 110%;
-  width: 225px;
-}
-
-.SearchHighlight label,
-.SearchHighlight description {
-  color: #008484;
-  margin: 0 0 8px 0;
-  padding: 0;
-}
-
-.SearchHighlightTitle {
-  font-weight: bold;
-}
-
-.SearchHighlight .dot {
-  width: 7px;
-  height: 7px;
-  background-image: -moz-image-rect(url("chrome://browser/skin/dots.png"), 0, 100%, 100%, 9);
-  background-size: 7px;
-  background-position: center center;
-  background-repeat: no-repeat;
-  -moz-margin-end: 2px;
-}
-
-.SearchHighlight .dot.filled {
-  background-image: -moz-image-rect(url("chrome://browser/skin/dots.png"), 0, 7, 100%, 0);
-}
-
-.SearchHighlight button {
-  margin: 0;
-  /* On some platforms clicking the button will steal focus from the search box
-     causing the popup to close. */
-  -moz-user-focus: ignore;
-}
-
-@media not all and (max-resolution: 1dppx) {
-  .SearchHighlight .dot {
-    background-image: -moz-image-rect(url("chrome://browser/skin/dots@2x.png"), 0, 100%, 100%, 18);
-  }
-
-  .SearchHighlight .dot.filled {
-    background-image: -moz-image-rect(url("chrome://browser/skin/dots@2x.png"), 0, 14, 100%, 0);
-  }
-}
-
 /* Notification overrides for Heartbeat UI */
 
 notification.heartbeat {
@@ -5762,6 +5731,10 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
 }
 
+#context-media-eme-learnmore {
+  list-style-image: url("chrome://browser/skin/drm-icon.svg#chains");
+}
+
 /* === END contextmenu.inc.css === */
 
 #context-navigation {

diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css
index c6c1860fe54e86dc25758a5ca60a57382492092e..ea9346447d85a1249dab88b5e819d49b28ffcf62 100644 (file)
--- a/LCARStrek/browser/devtools/netmonitor.css
+++ b/LCARStrek/browser/devtools/netmonitor.css
@@ -436,6 +436,7 @@ box.requests-menu-status[code^="5"] {
 }
 
 .tabpanel-summary-value {
+  color: inherit;
   -moz-padding-start: 3px;
 }
 
@@ -521,10 +522,6 @@ box.requests-menu-status[code^="5"] {
   overflow: auto;
 }
 
-#security-error-message {
-  white-space: pre-wrap;
-}
-
 .security-warning-icon {
   background-image: url("alerticon-warning.png");
   background-size: 13px 12px;

diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css
index 0de177484dd17abfa3df8b78d54c3ffc896a9a16..a3f4d5560a818326bef40b9777070c61e7c9b252 100644 (file)
--- a/LCARStrek/browser/devtools/webconsole.css
+++ b/LCARStrek/browser/devtools/webconsole.css
@@ -301,6 +301,17 @@ a {
   margin: 0 6px;
 }
 
+.message[category=network] .xhr {
+  background-color: var(--theme-body-color-alt);
+  color: var(--theme-body-background);
+  border-radius: 3px;
+  font-weight: bold;
+  font-size: 10px;
+  padding: 2px;
+  line-height: 10px;
+  -moz-margin-end: 1ex;
+}
+
 /* CSS styles */
 .webconsole-filter-button[category="css"] > .toolbarbutton-menubutton-button:before {
   background-image: linear-gradient(#7575BF, #4E4E7F);

diff --git a/LCARStrek/browser/dots.png b/LCARStrek/browser/dots.png
deleted file mode 100644 (file)
index d47b638..0000000
Binary files a/LCARStrek/browser/dots.png and /dev/null differ

diff --git a/LCARStrek/browser/dots@2x.png b/LCARStrek/browser/dots@2x.png
deleted file mode 100644 (file)
index b7c1aff..0000000
Binary files a/LCARStrek/browser/dots@2x.png and /dev/null differ

diff --git a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
index f4fb871cf6db3c0b882c1c0ccd404b2d026cace4..1534b699d78c753f1318f8caacbaaba9469533e8 100644 (file)
--- a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
+++ b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
@@ -58,10 +58,14 @@ richlistitem.download:not([selected]):hover {
 
 /*** Button icons ***/
 
+.downloadButton.downloadConfirmBlock,
 .downloadButton.downloadCancel {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
+richlistitem.download:hover > .downloadButton.downloadConfirmBlock,
+richlistitem.download:hover > .downloadButton.downloadConfirmBlock:hover,
+richlistitem.download:hover > .downloadButton.downloadConfirmBlock:active,
 richlistitem.download:hover > .downloadButton.downloadCancel,
 richlistitem.download:hover > .downloadButton.downloadCancel:hover,
 richlistitem.download:hover > .downloadButton.downloadCancel:active {
@@ -88,6 +92,10 @@ richlistitem.download:hover > .downloadButton.downloadRetry:active {
    -moz-image-region: rect(32px, 32px, 48px, 16px);
 }
 
+richlistitem.download[selected] > .downloadButton.downloadConfirmBlock,
+richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock,
+richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:hover,
+richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:active,
 richlistitem.download[selected] > .downloadButton.downloadCancel,
 richlistitem.download[selected]:hover > .downloadButton.downloadCancel,
 richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover,

diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css
index e90d51e054f9802e6c3a8099370cc5f070998e12..c27b724ade1c48bb1d945872770370050db3c952 100644 (file)
--- a/LCARStrek/browser/downloads/downloads.css
+++ b/LCARStrek/browser/downloads/downloads.css
@@ -176,9 +176,13 @@ richlistitem[type="download"]:first-child {
 
 /*** Button icons ***/
 
+.downloadButton.downloadConfirmBlock,
 .downloadButton.downloadCancel {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock,
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:hover,
+richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:active,
 richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel,
 richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover,
 richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active {

diff --git a/LCARStrek/browser/preferences/in-content/icons.png b/LCARStrek/browser/preferences/in-content/icons.png
deleted file mode 100644 (file)
index 44f2b8d..0000000
Binary files a/LCARStrek/browser/preferences/in-content/icons.png and /dev/null differ

diff --git a/LCARStrek/browser/preferences/in-content/icons.svg b/LCARStrek/browser/preferences/in-content/icons.svg
new file mode 100644 (file)
index 0000000..a7fab80
--- /dev/null
+++ b/LCARStrek/browser/preferences/in-content/icons.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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;
+    }
+    use {
+      fill: #FFCF00;
+      stroke: rgba(0,0,0,0.4);
+      stroke-width: 0;
+    }
+    use[id$="-active"] {
+      fill: #000000;
+    }
+  </style>
+  <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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </g>
+  </defs>
+  <use id="general" xlink:href="#general-shape"/>
+  <use id="general-active" xlink:href="#general-shape"/>
+  <use id="search" xlink:href="#search-shape"/>
+  <use id="search-active" xlink:href="#search-shape"/>
+  <use id="content" xlink:href="#content-shape"/>
+  <use id="content-active" xlink:href="#content-shape"/>
+  <use id="applications" xlink:href="#applications-shape"/>
+  <use id="applications-active" xlink:href="#applications-shape"/>
+  <use id="privacy" xlink:href="#privacy-shape"/>
+  <use id="privacy-active" xlink:href="#privacy-shape"/>
+  <use id="security" xlink:href="#security-shape"/>
+  <use id="security-active" xlink:href="#security-shape"/>
+  <use id="sync" xlink:href="#sync-shape"/>
+  <use id="sync-active" xlink:href="#sync-shape"/>
+  <use id="advanced" xlink:href="#advanced-shape"/>
+  <use id="advanced-active" xlink:href="#advanced-shape"/>
+</svg>

diff --git a/LCARStrek/browser/preferences/in-content/icons@2x.png b/LCARStrek/browser/preferences/in-content/icons@2x.png
deleted file mode 100644 (file)
index 9df3005..0000000
Binary files a/LCARStrek/browser/preferences/in-content/icons@2x.png and /dev/null differ

diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index 8a37aff2b769b8722e9c8e1a820c04a10c6bdba9..ecfb6bab05a688739a2027a16ba7d1012c036e47 100644 (file)
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -104,79 +104,78 @@ treecol {
 .category-icon {
   width: 24px;
   height: 24px;
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.png");
 }
 
 #category-general > .category-icon {
-  -moz-image-region: rect(0, 24px, 24px, 0);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general");
 }
 
 #category-general:hover > .category-icon,
 #category-general[selected] > .category-icon {
-  -moz-image-region: rect(24px, 24px, 48px, 0);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-active");
 }
 
 #category-search > .category-icon {
-  -moz-image-region: rect(0, 192px, 24px, 168px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search");
 }
 
 #category-search:hover > .category-icon,
 #category-search[selected] > .category-icon {
-  -moz-image-region: rect(24px, 192px, 48px, 168px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-active");
 }
 
 #category-content > .category-icon {
-  -moz-image-region: rect(0, 48px,  24px, 24px)
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content");
 }
 
 #category-content:hover > .category-icon,
 #category-content[selected] > .category-icon {
-  -moz-image-region: rect(24px, 48px, 48px, 24px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-active");
 }
 
 #category-application > .category-icon {
-  -moz-image-region: rect(0, 72px,  24px, 48px)
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications");
 }
 
 #category-application:hover > .category-icon,
 #category-application[selected] > .category-icon {
-  -moz-image-region: rect(24px, 72px, 48px, 48px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-active");
 }
 
 #category-privacy > .category-icon {
-  -moz-image-region: rect(0, 96px,  24px, 72px)
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy");
 }
 
 #category-privacy:hover > .category-icon,
 #category-privacy[selected] > .category-icon {
-  -moz-image-region: rect(24px, 96px, 48px, 72px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-active");
 }
 
 #category-security > .category-icon {
-  -moz-image-region: rect(0, 120px,  24px, 96px)
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security");
 }
 
 #category-security:hover > .category-icon,
 #category-security[selected] > .category-icon {
-  -moz-image-region: rect(24px, 120px, 48px, 96px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-active");
 }
 
 #category-sync > .category-icon {
-  -moz-image-region: rect(0, 144px, 24px, 120px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync");
 }
 
 #category-sync:hover > .category-icon,
 #category-sync[selected] > .category-icon {
-  -moz-image-region: rect(24px, 144px, 48px, 120px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync-active");
 }
 
 #category-advanced > .category-icon {
-  -moz-image-region: rect(0, 168px, 24px, 144px)
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced");
 }
 
 #category-advanced:hover > .category-icon,
 #category-advanced[selected] > .category-icon {
-  -moz-image-region: rect(24px, 168px, 48px, 144px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-active");
 }
 
 @media (max-width: 800px) {
@@ -296,6 +295,20 @@ treecol {
   -moz-margin-end: 8px !important;
 }
 
+/* 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,
+#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 {
@@ -327,10 +340,6 @@ description > html|a {
 /*  -moz-margin-end: 4px; / add the 4px end-margin of other elements */
 }
 
-#encryptionPanel {
-  margin-top: 15px;
-}
-
 #telemetryLearnMore,
 #FHRLearnMore,
 #crashReporterLearnMore {
@@ -351,6 +360,10 @@ description > html|a {
   }
 }
 
+#showUpdateHistory {
+  -moz-margin-start: 0;
+}
+
 /**
  * Dialog
  */
@@ -418,6 +431,11 @@ description > html|a {
   width: 66ch;
 }
 
+.largeDialogContainer.doScroll {
+  overflow-y: auto;
+  -moz-box-flex: 1;
+}
+
 /**
  * End Dialog
  */
@@ -460,80 +478,4 @@ caption {
 
   checkbox[checked]::before {
   }
-
-  .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons@2x.png");
-  }
-
-  #category-general > .category-icon {
-    -moz-image-region: rect(0, 48px, 48px, 0);
-  }
-
-  #category-general:hover > .category-icon,
-  #category-general[selected] > .category-icon {
-    -moz-image-region: rect(48px, 48px, 96px, 0);
-  }
-
-  #category-search > .category-icon {
-    -moz-image-region: rect(0, 384px, 48px, 336px);
-  }
-
-  #category-search:hover > .category-icon,
-  #category-search[selected] > .category-icon {
-    -moz-image-region: rect(48, 384px, 96px, 336px);
-  }
-
-  #category-content > .category-icon {
-    -moz-image-region: rect(0, 96px, 48px, 48px);
-  }
-
-  #category-content:hover > .category-icon,
-  #category-content[selected] > .category-icon {
-    -moz-image-region: rect(48px, 96px, 96px, 48px);
-  }
-
-  #category-application > .category-icon {
-    -moz-image-region: rect(0, 144px, 48px, 96px);
-  }
-
-  #category-application:hover > .category-icon,
-  #category-application[selected] > .category-icon {
-    -moz-image-region: rect(48px, 144px, 96px, 96px);
-  }
-
-  #category-privacy > .category-icon {
-    -moz-image-region: rect(0, 192px, 48px, 144px);
-  }
-
-  #category-privacy:hover > .category-icon,
-  #category-privacy[selected] > .category-icon {
-    -moz-image-region: rect(48px, 192px, 96px, 144px);
-  }
-
-  #category-security > .category-icon {
-    -moz-image-region: rect(0, 240px, 48px, 192px);
-  }
-
-  #category-security:hover > .category-icon,
-  #category-security[selected] > .category-icon {
-    -moz-image-region: rect(48px, 240px, 96px, 192px);
-  }
-
-  #category-sync > .category-icon {
-    -moz-image-region: rect(0, 288px, 48px, 240px);
-  }
-
-  #category-sync:hover > .category-icon,
-  #category-sync[selected] > .category-icon {
-    -moz-image-region: rect(48px, 288px, 96px, 240px);
-  }
-
-  #category-advanced > .category-icon {
-    -moz-image-region: rect(0, 336px, 48px, 288px);
-  }
-
-  #category-advanced:hover > .category-icon,
-  #category-advanced[selected] > .category-icon {
-    -moz-image-region: rect(48px, 336px, 96px, 288px);
-  }
 }

diff --git a/LCARStrek/browser/preferences/preferences.css b/LCARStrek/browser/preferences/preferences.css
index f72adf12d61cf8268a959dc6286ebdfb8fb84a75..38742be5dddf7106b2ff8405a414a02faf1bc0a2 100644 (file)
--- a/LCARStrek/browser/preferences/preferences.css
+++ b/LCARStrek/browser/preferences/preferences.css
@@ -79,6 +79,7 @@ radio[pane=paneSync] {
   list-style-image: url("chrome://browser/skin/preferences/Options-sync.png") !important;
 }
 
+/* These lines should be removed as part of fixing bug 1140495 */
 label.small {
   font-size: smaller;
 }

diff --git a/LCARStrek/global/menu/menu-arrow.svg b/LCARStrek/global/menu/menu-arrow.svg
new file mode 100644 (file)
index 0000000..78b8f3a
--- /dev/null
+++ b/LCARStrek/global/menu/menu-arrow.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     x="0"
+     y="0"
+     height="16"
+     width="16"
+     viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #FF9F00;
+    }
+    use[id$="-disabled"] {
+      fill: #8050B0;
+    }
+    use[id$="-hover"] {
+      fill: #000000;
+    }
+  </style>
+  <defs style="display: none;">
+    <path id="arrow-shape" d="m 6,4 0,8 5,-4 z"/>
+  </defs>
+  <use id="arrow" xlink:href="#arrow-shape"/>
+  <use id="arrow-disabled" xlink:href="#arrow-shape"/>
+  <use id="arrow-hover" xlink:href="#arrow-shape"/>
+</svg>