author | Dão Gottwald <dao@mozilla.com> |
Mon, 07 Nov 2011 13:52:06 +0100 | |
changeset 79886 | 9ba11f3d00f89545d78d8060187a00fa53f18316 |
parent 79885 | 81523479576525e98ba63d1cfbb17c8ec87f4671 |
child 79887 | 42e8b5f1357cb3d3d637933f406b4429417f9834 |
push id | 21436 |
push user | rcampbell@mozilla.com |
push date | Mon, 07 Nov 2011 14:46:42 +0000 |
treeherder | mozilla-central@42e8b5f1357c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | msucan |
bugs | 700243 |
milestone | 10.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/devtools/styleinspector/csshtmltree.xul +++ b/browser/devtools/styleinspector/csshtmltree.xul @@ -14,50 +14,54 @@ - - The Original Code is the Mozilla Inspector Module. - - The Initial Developer of the Original Code is The Mozilla Foundation. - Portions created by the Initial Developer are Copyright (C) 2011 - the Initial Developer. All Rights Reserved. - - Contributor(s): - - Joe Walker (jwalker@mozilla.com) (original author) + - Joe Walker <jwalker@mozilla.com> (original author) - Mihai Șucan <mihai.sucan@gmail.com> - Michael Ratcliffe <mratcliffe@mozilla.com> + - Dão Gottwald <dao@mozilla.com> - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - in which case the provisions of the GPL or the LGPL are applicable instead - of those above. If you wish to allow use of your version of this file only - under the terms of either the GPL or the LGPL, and not to allow others to - use your version of this file under the terms of the MPL, indicate your - decision by deleting the provisions above and replace them with the notice - and other provisions required by the LGPL or the GPL. If you do not delete - the provisions above, a recipient may use your version of this file under - the terms of any one of the MPL, the GPL or the LGPL. - - ***** END LICENSE BLOCK ***** --> + <?xml-stylesheet href="chrome://global/skin/global.css"?> <?xml-stylesheet href="chrome://browser/skin/devtools/csshtmltree.css" type="text/css"?> + <!DOCTYPE window [ <!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/styleinspector.dtd"> %inspectorDTD; <!ELEMENT loop ANY> <!ATTLIST li foreach CDATA #IMPLIED> <!ATTLIST div foreach CDATA #IMPLIED> <!ATTLIST loop foreach CDATA #IMPLIED> <!ATTLIST a target CDATA #IMPLIED> <!ATTLIST a __pathElement CDATA #IMPLIED> <!ATTLIST div _id CDATA #IMPLIED> <!ATTLIST div save CDATA #IMPLIED> <!ATTLIST table save CDATA #IMPLIED> <!ATTLIST loop if CDATA #IMPLIED> <!ATTLIST tr if CDATA #IMPLIED> ]> + <xul:window xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <!-- The output from #templateRoot (below) is inserted here. --> <div id="root"></div> <!-- The output from #templatePath (below) is inserted here. --> <div id="path"> @@ -83,25 +87,25 @@ To visually debug the templates without running firefox, alter the display:none --> <div style="display:none;"> <!-- templateRoot sits at the top of the window and contains the "include default styles" checkbox. For data it needs an instance of CssHtmlTree. --> <div id="templateRoot"> - <xul:hbox class="header" flex="1"> + <xul:hbox class="headerControls" flex="1"> <label class="userStylesLabel"> <input class="onlyuserstyles" save="${onlyUserStylesCheckbox}" type="checkbox" onchange="${onlyUserStylesChanged}" checked=""/> &userStylesLabel; </label> <xul:textbox class="searchfield" type="search" save="${searchField}" - placeholder="&userStylesSearch;" - oncommand="${filterChanged}"/> + placeholder="&userStylesSearch;" + oncommand="${filterChanged}"/> </xul:hbox> </div> <!-- templatePath sits just below the top of the window showing what we're looking at. For data it needs an instance of CssHtmlTree. --> <div id="templatePath"> @@ -156,17 +160,17 @@ To visually debug the templates without <table> <loop foreach="selector in ${matchedSelectorViews}"> <tr> <td dir="ltr" class="rule-text ${selector.statusClass}"> ${selector.humanReadableText(__element)} </td> <td class="rule-link"> <a target="_blank" href="view-source:${selector.selectorInfo.href}" class="link" - title="${selector.selectorInfo.href}">${selector.selectorInfo.source}</a> + title="${selector.selectorInfo.href}">${selector.selectorInfo.source}</a> </td> </tr> </loop> </table> </div> </div> </xul:window>
--- a/browser/themes/gnomestripe/browser/devtools/csshtmltree.css +++ b/browser/themes/gnomestripe/browser/devtools/csshtmltree.css @@ -17,16 +17,17 @@ * The Mozilla Foundation. * Portions created by the Initial Developer are Copyright (C) 2011 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Joe Walker <jwalker@mozilla.com> (original author) * Mihai Șucan <mihai.sucan@gmail.com> * Michael Ratcliffe <mratcliffe@mozilla.com> + * Dão Gottwald <dao@mozilla.com> * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your @@ -212,20 +213,20 @@ } #noResults { font-size: 18px; margin-top: 5px; text-align: center; } -.header { +.headerControls { color: -moz-dialogtext; background-color: -moz-dialog; - padding: 5px 0 0; + padding-top: 5px; } .onlyuserstyles, .userStylesLabel { cursor: pointer; } .userStylesLabel {
--- a/browser/themes/pinstripe/browser/devtools/csshtmltree.css +++ b/browser/themes/pinstripe/browser/devtools/csshtmltree.css @@ -17,16 +17,17 @@ * The Mozilla Foundation. * Portions created by the Initial Developer are Copyright (C) 2011 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Joe Walker <jwalker@mozilla.com> (original author) * Mihai Șucan <mihai.sucan@gmail.com> * Michael Ratcliffe <mratcliffe@mozilla.com> + * Dão Gottwald <dao@mozilla.com> * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your @@ -214,20 +215,20 @@ } #noResults { font-size: 18px; margin-top: 5px; text-align: center; } -.header { +.headerControls { color: -moz-dialogtext; background-color: -moz-dialog; - padding: 5px 0 0; + padding-top: 5px; } .onlyuserstyles, .userStylesLabel { cursor: pointer; } .userStylesLabel {
--- a/browser/themes/winstripe/browser/devtools/csshtmltree.css +++ b/browser/themes/winstripe/browser/devtools/csshtmltree.css @@ -17,16 +17,17 @@ * The Mozilla Foundation. * Portions created by the Initial Developer are Copyright (C) 2011 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Joe Walker <jwalker@mozilla.com> (original author) * Mihai Șucan <mihai.sucan@gmail.com> * Michael Ratcliffe <mratcliffe@mozilla.com> + * Dão Gottwald <dao@mozilla.com> * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your @@ -214,20 +215,20 @@ } #noResults { font-size: 18px; margin-top: 5px; text-align: center; } -.header { +.headerControls { color: -moz-dialogtext; background-color: -moz-dialog; - padding: 5px 0 0; + padding-top: 5px; } .onlyuserstyles, .userStylesLabel { cursor: pointer; } .userStylesLabel {