author | Abdelrhman Ahmed <a.ahmed1026@gmail.com> |
Mon, 26 Jan 2015 17:14:29 +0100 | |
changeset 225841 | 722169be8e1439da5f3f9588944275e602a8e43e |
parent 225840 | 0dc8aa096acaec1e8a86904be9b0357bd7ff7244 |
child 225842 | 9bfda2f52e8221dc85112f7a9117e7e55428cc44 |
push id | 28176 |
push user | ryanvm@gmail.com |
push date | Mon, 26 Jan 2015 21:48:45 +0000 |
treeherder | mozilla-central@38e4719e71af [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | florian |
bugs | 1113639 |
milestone | 38.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/components/preferences/in-content/search.xul +++ b/browser/components/preferences/in-content/search.xul @@ -40,19 +40,20 @@ <groupbox id="oneClickSearchProvidersGroup" data-category="paneSearch"> <caption label="&oneClickSearchEngines.label;"/> <label>&chooseWhichOneToDisplay.label;</label> <tree id="engineList" flex="1" rows="8" hidecolumnpicker="true" editable="true" seltype="single"> <treechildren id="engineChildren" flex="1"/> <treecols> - <treecol id="engineShown" type="checkbox" editable="true"/> - <treecol id="engineName" flex="4" label="&engineNameColumn.label;"/> - <treecol id="engineKeyword" flex="1" label="&engineKeywordColumn.label;" editable="true"/> + <treecol id="engineShown" type="checkbox" editable="true" sortable="false"/> + <treecol id="engineName" flex="4" label="&engineNameColumn.label;" sortable="false"/> + <treecol id="engineKeyword" flex="1" label="&engineKeywordColumn.label;" editable="true" + sortable="false"/> </treecols> </tree> <hbox> <button id="restoreDefaultSearchEngines" label="&restoreDefaultSearchEngines.label;" accesskey="&restoreDefaultSearchEngines.accesskey;" />
--- a/browser/components/preferences/search.xul +++ b/browser/components/preferences/search.xul @@ -54,19 +54,21 @@ <label>&chooseWhichOneToDisplay.label;</label> <tree id="engineList" flex="1" rows="8" hidecolumnpicker="true" editable="true" seltype="single" onselect="gSearchPane.onTreeSelect();" onkeypress="gSearchPane.onTreeKeyPress(event);"> <treechildren id="engineChildren" flex="1" ondragstart="onDragEngineStart(event);"/> <treecols> - <treecol id="engineShown" type="checkbox" style="min-width: 26px;" editable="true"/> - <treecol id="engineName" flex="4" label="&engineNameColumn.label;"/> - <treecol id="engineKeyword" flex="1" label="&engineKeywordColumn.label;" editable="true"/> + <treecol id="engineShown" type="checkbox" style="min-width: 26px;" editable="true" + sortable="false"/> + <treecol id="engineName" flex="4" label="&engineNameColumn.label;" sortable="false"/> + <treecol id="engineKeyword" flex="1" label="&engineKeywordColumn.label;" editable="true" + sortable="false"/> </treecols> </tree> <hbox> <button id="restoreDefaultSearchEngines" label="&restoreDefaultSearchEngines.label;" accesskey="&restoreDefaultSearchEngines.accesskey;" oncommand="gSearchPane.onRestoreDefaults();"/>
--- a/toolkit/themes/shared/in-content/common.inc.css +++ b/toolkit/themes/shared/in-content/common.inc.css @@ -636,17 +636,17 @@ xul|treecol:not([hideheader="true"]), xul|treecolpicker { -moz-appearance: none; border: none; background-color: #ebebeb; color: #808080; padding: 5px 10px; } -xul|treecol:not([hideheader="true"]):hover, +xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover, xul|treecolpicker:hover { background-color: #dadada; color: #333; } xul|treecol:not([hideheader="true"]):not(:first-child), xul|treecolpicker { -moz-border-start-width: 1px; @@ -677,9 +677,9 @@ xul|treechildren::-moz-tree-row { /* Color needs to be set on tree cell in order to be applied */ xul|treechildren::-moz-tree-cell-text { color: #333; } xul|treechildren::-moz-tree-cell-text(selected) { color: #fff; -} \ No newline at end of file +}