From 1eb9479dcd57435d5baac6c245734008e702917b Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 26 Jan 2015 02:06:25 +0100 Subject: [PATCH] forth and final part of syncing LCARStrek with Firefox 35 windows theme changes --- .../preferences/in-content/preferences.css | 4 +- .../browser/preferences/in-content/search.css | 53 +++++++++++++++ LCARStrek/browser/preferences/search.css | 65 +++++++++++++++++++ LCARStrek/browser/search-history-icon.svg | 32 +++++++++ LCARStrek/browser/searchbar.css | 19 ++++++ LCARStrek/global/in-content/common.css | 3 +- 6 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 LCARStrek/browser/preferences/in-content/search.css create mode 100644 LCARStrek/browser/preferences/search.css create mode 100644 LCARStrek/browser/search-history-icon.svg diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 104c7c76..e3251d63 100644 --- 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 index 00000000..b837e8d3 --- /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 index 00000000..154b922f --- /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 index 00000000..bfd3a17d --- /dev/null +++ b/LCARStrek/browser/search-history-icon.svg @@ -0,0 +1,32 @@ + + + + + + + + + + diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css index 84940d5c..83c962fe 100644 --- 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 c6cb07e6..3476dc3c 100644 --- 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; } -- 2.43.0