forth and final part of syncing LCARStrek with Firefox 35 windows theme changes

diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index 104c7c76a99333084af41a887ce2bc7ec8512a37..e3251d630a16e0e586632f1724a2916a892eb8d0 100644 (file)
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -109,12 +109,12 @@ treecol {
 }
 
 #category-search > .category-icon {
-  -moz-image-region: rect(0, 194px, 24px, 168px);
+  -moz-image-region: rect(0, 192px, 24px, 168px);
 }
 
 #category-search:hover > .category-icon,
 #category-search[selected] > .category-icon {
-  -moz-image-region: rect(24px, 194px, 48px, 168px);
+  -moz-image-region: rect(24px, 192px, 48px, 168px);
 }
 
 #category-content > .category-icon {

diff --git a/LCARStrek/browser/preferences/in-content/search.css b/LCARStrek/browser/preferences/in-content/search.css
new file mode 100644 (file)
index 0000000..b837e8d
--- /dev/null
+++ b/LCARStrek/browser/preferences/in-content/search.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/. */
+
+#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 6px;
+}
+/*
+#engineList treechildren::-moz-tree-image(engineShown, 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) {
+  list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted");
+}
+*/
+#engineList treechildren::-moz-tree-image(engineName) {
+  -moz-margin-end: 10px;
+  -moz-margin-start: 1px;
+  width: 16px;
+  height: 16px;
+}
+
+#engineList treechildren::-moz-tree-row {
+/*  min-height: 36px; */
+}
+
+#engineList treechildren::-moz-tree-drop-feedback {
+  background-color: #008484;
+  width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window
+                     we may have, overflow isn't visible. */
+  height: 2px;
+  -moz-margin-start: 0;
+}
+
+#engineShown {
+  min-width: 26px;
+}
+
+#addEnginesBox {
+  margin-bottom: 1em;
+}

diff --git a/LCARStrek/browser/preferences/search.css b/LCARStrek/browser/preferences/search.css
new file mode 100644 (file)
index 0000000..154b922
--- /dev/null
+++ b/LCARStrek/browser/preferences/search.css
@@ -0,0 +1,65 @@
+/* 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 > .menulist-label-box > .menulist-icon {
+  height: 16px;
+}
+
+/* Reserve space so that localized labels can wrap without hiding the
+   'add more engines' link at the bottom. See bug 1112688. */
+#oneClickSearchProvidersGroup {
+  margin-bottom: 3em;
+}
+
+#engineList {
+  margin: .5em 6px;
+}
+/*
+#engineList treechildren::-moz-tree-checkbox {
+  list-style-image: url("chrome://browser/skin/preferences/checkbox.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#engineList treechildren::-moz-tree-checkbox(checked) {
+  -moz-image-region: rect(0, 64px, 16px, 48px);
+}
+
+@media (-moz-windows-classic) {
+  #engineList treechildren::-moz-tree-checkbox {
+    list-style-image: url("chrome://browser/skin/preferences/checkbox-classic.png");
+  }
+
+  #engineList treechildren::-moz-tree-checkbox(checked) {
+    -moz-image-region: rect(0, 48px, 16px, 32px);
+  }
+}
+
+@media not all and (-moz-windows-classic) {
+  #engineList treechildren::-moz-tree-checkbox(hover) {
+    -moz-image-region: rect(0, 48px, 16px, 32px);
+  }
+
+  #engineList treechildren::-moz-tree-checkbox(checked, hover) {
+    -moz-image-region: rect(0, 80px, 16px, 64px);
+  }
+}
+*/
+#engineList treechildren::-moz-tree-image(engineName) {
+  -moz-margin-end: 4px;
+  -moz-margin-start: 0;
+  width: 16px;
+  height: 16px;
+}
+
+#engineList treechildren::-moz-tree-row {
+  min-height: 20px;
+}
+
+#engineList treechildren::-moz-tree-drop-feedback {
+  background-color: #008484;
+  width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window
+                     we may have, overflow isn't visible. */
+  height: 2px;
+  -moz-margin-start: 0;
+}

diff --git a/LCARStrek/browser/search-history-icon.svg b/LCARStrek/browser/search-history-icon.svg
new file mode 100644 (file)
index 0000000..bfd3a17
--- /dev/null
+++ b/LCARStrek/browser/search-history-icon.svg
@@ -0,0 +1,32 @@
+<?xml version="1.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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     x="0"
+     y="0"
+     width="16"
+     height="16"
+     viewBox="0 0 16 16">
+<style type="text/css">
+
+use:not(:target) {
+  display: none;
+}
+
+use {
+  fill: #FFCF00;
+}
+
+use[id$="-active"] {
+  fill: #000000;
+}
+
+</style>
+<defs style="display:none">
+  <path id="search-history-glyph" d="M8,1C4.1,1,1,4.1,1,8c0,3.9,3.1,7,7,7c3.9,0,7-3.1,7-7 C15,4.1,11.9,1,8,1z M8,13.3c-2.9,0-5.3-2.4-5.3-5.3S5.1,2.7,8,2.7c2.9,0,5.3,2.4,5.3,5.3S10.9,13.3,8,13.3z M10.5,7H9V5 c0-0.6-0.4-1-1-1S7,4.4,7,5v3c0,0.6,0.4,1,1,1h2.5c0.6,0,1-0.4,1-1C11.5,7.4,11.1,7,10.5,7z"/>
+</defs>
+<use id="search-history-icon" xlink:href="#search-history-glyph"/>
+<use id="search-history-icon-active" xlink:href="#search-history-glyph"/>
+</svg>

diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css
index 84940d5cce9f2608c45082ff4c7380226c7be0ac..83c962fe08eb4d0add15fe8769449e47fb3e517c 100644 (file)
--- a/LCARStrek/browser/searchbar.css
+++ b/LCARStrek/browser/searchbar.css
@@ -152,6 +152,7 @@ searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon
 .search-panel-one-offs {
   margin: 0 0 !important;
   border-top: 1px solid #9C9CFF;
+  line-height: 0;
 }
 
 .searchbar-engine-one-off-item {
@@ -242,6 +243,24 @@ searchbar[oneoffui] .searchbar-engine-button {
   border-top: none !important;
 }
 
+.search-panel-tree > .autocomplete-treebody::-moz-tree-cell-text {
+  -moz-padding-start: 4px;
+}
+
+.search-panel-tree > .autocomplete-treebody::-moz-tree-image {
+  -moz-padding-start: 5px;
+  width: 14px;
+  height: 14px;
+}
+
+.search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory) {
+  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon");
+}
+
+.search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory, selected) {
+  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon-active");
+}
+
 searchbar[oneoffui] .searchbar-engine-image {
   -moz-margin-start: -1px;
 }

diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css
index c6cb07e62b8a7d37423adced1446e9152d4b1e4a..3476dc3c69fd40c68b1ca8ac0610a5424b8bf3a1 100644 (file)
--- a/LCARStrek/global/in-content/common.css
+++ b/LCARStrek/global/in-content/common.css
@@ -632,5 +632,6 @@ xul|*.checkbox-icon {
 html|a:-moz-focusring,
 xul|*.text-link:-moz-focusring,
 xul|*.inline-link:-moz-focusring {
-  border: 1px dotted #3333FF;
+  /* Don't specify the outline-color, we should always use initial value. */
+  outline: 1px dotted;
 }