diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /toolkit/components/console/content/console.xul | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/components/console/content/console.xul')
| -rw-r--r-- | toolkit/components/console/content/console.xul | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul index 0abd0a981..90b900cf9 100644 --- a/toolkit/components/console/content/console.xul +++ b/toolkit/components/console/content/console.xul @@ -77,9 +77,12 @@ <toolbarseparator/> <toolbarbutton id="Console:clear" oncommand="clearConsole();" label="&clear.label;" accesskey="&clear.accesskey;"/> + <toolbarspring/> </toolbar> <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true"> + <label value="&filter2.label;" control="Filter"/> + <textbox accesskey="&filter2.accesskey;" type="search" id="Filter" oncommand="changeFilter();"/> <label value="&codeEval.label;" accesskey="&codeEval.accesskey;" control="TextboxEval"/> <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/> <toolbarbutton id="ButtonEval" label="&evaluate.label;" @@ -90,12 +93,4 @@ <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/> <iframe name="Evaluator" id="Evaluator" collapsed="true"/> - - <statusbar> - <statusbarpanel flex="1" pack="start"> - <label value="&filter2.label;" control="Filter"/> - <textbox accesskey="&filter2.accesskey;" type="search" - id="Filter" oncommand="changeFilter();"/> - </statusbarpanel> - </statusbar> </window> |