diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 6ef6748ba75a..e0b2ff35c7d3 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -2074,12 +2074,6 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { color: hsl(210,11%,16%); } -/* Web Console */ - -.web-console-frame { - border-bottom: 1px solid #aaa; -} - /* Error counter */ #developer-toolbar-toolbox-button[error-count]:before { diff --git a/browser/themes/linux/devtools/webconsole.css b/browser/themes/linux/devtools/webconsole.css index 92e7c6d53712..87a3e1770a6d 100644 --- a/browser/themes/linux/devtools/webconsole.css +++ b/browser/themes/linux/devtools/webconsole.css @@ -2,271 +2,22 @@ * 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/. */ -/* General output styles */ - -.webconsole-timestamp { - color: GrayText; - margin-top: 0; - margin-bottom: 0; - font-family: "DejaVu Sans Mono", monospace; -} - -.hud-msg-node { - list-style-image: url(chrome://browser/skin/devtools/webconsole.png); - -moz-image-region: rect(0, 1px, 0, 0); -} - -.webconsole-msg-icon { - margin: 3px 4px; - width: 8px; - height: 8px; -} - -.hud-clickable { - cursor: pointer; - text-decoration: underline; -} +%include ../../shared/devtools/webconsole.inc.css +.webconsole-timestamp, .webconsole-msg-body { - margin-top: 0; - margin-bottom: 3px; - -moz-margin-start: 3px; - -moz-margin-end: 6px; - white-space: pre-wrap; font-family: "DejaVu Sans Mono", monospace; } -.webconsole-msg-body-piece { - margin: 0; -} - -.webconsole-msg-url { - margin: 0 6px; -} - -/* Repeated messages */ -.webconsole-msg-repeat { - margin: 2px 0; - padding-left: 4px; - padding-right: 4px; - color: white; - background-color: red; - border-radius: 40px; - font: message-box; - font-size: 0.9em; - font-weight: 600; -} - -/* TODO move this and other functional rules to content - bug 635359 */ -.webconsole-msg-repeat[value="1"] { - display: none; -} - -.webconsole-location { - margin-top: 0; - margin-bottom: 0; - -moz-margin-start: 0; - -moz-margin-end: 6px; - width: 10em; - text-align: end; -} - -.webconsole-mixed-content { - color: #FF0000; -} - -.webconsole-mixed-content-link { - color: #0000EE; - margin: 0; -} - -.hud-msg-node[selected="true"] > .webconsole-timestamp, -.hud-msg-node[selected="true"] > .webconsole-location { - color: inherit; -} - .jsterm-input-node, .jsterm-complete-node { font: 0.9em "DejaVu Sans Mono", monospace; } .hud-output-node { - -moz-appearance: none; - border-bottom: 1px solid ThreeDShadow; - margin: 0; font-size: 0.9em; } -.hud-filtered-by-type, -.hud-filtered-by-string { - display: none; -} - -.hidden-message { - display: block; - visibility: hidden; - height: 0; - overflow: hidden; -} - -/* WebConsole colored drops */ - -.webconsole-filter-button { - -moz-user-focus: normal; -} - -.webconsole-filter-button[checked] { - color: white !important; -} - -.webconsole-filter-button > .toolbarbutton-menubutton-button:before { - content: ""; - display: inline-block; - height: 8px; - width: 8px; - border-radius: 50%; - margin-left: 5px; - border-width: 1px; - border-style: solid; -} - -/* Network styles */ -.webconsole-filter-button[category="net"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#444444, #000000); - border-color: #777; -} - -.webconsole-msg-network > .webconsole-msg-icon-container { - -moz-border-start: solid #000 6px; -} - -.webconsole-msg-network.webconsole-msg-error { - -moz-image-region: rect(0, 16px, 8px, 8px); -} - -/* CSS styles */ -.webconsole-filter-button[category="css"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#2DC3F3, #00B6F0); - border-color: #1BA2CC; -} - -.webconsole-msg-cssparser > .webconsole-msg-icon-container { - -moz-border-start: solid #00b6f0 6px; -} - -.webconsole-msg-cssparser.webconsole-msg-error { - -moz-image-region: rect(8px, 16px, 16px, 8px); -} - -.webconsole-msg-cssparser.webconsole-msg-warn { - -moz-image-region: rect(8px, 24px, 16px, 16px); -} - -/* JS styles */ -.webconsole-filter-button[category="js"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#FCB142, #FB9500); - border-color: #E98A00; -} - -.webconsole-msg-exception > .webconsole-msg-icon-container { - -moz-border-start: solid #fb9500 6px; -} - -.webconsole-msg-exception.webconsole-msg-error { - -moz-image-region: rect(16px, 16px, 24px, 8px); -} - -.webconsole-msg-exception.webconsole-msg-warn { - -moz-image-region: rect(16px, 24px, 24px, 16px); -} - -/* Web Developer styles */ -.webconsole-filter-button[category="logging"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#B9B9B9, #AAAAAA); - border-color: #929292; -} - -.webconsole-msg-console > .webconsole-msg-icon-container { - -moz-border-start: solid #cbcbcb 6px; -} - -.webconsole-msg-console.webconsole-msg-error, -.webconsole-msg-output.webconsole-msg-error { - -moz-image-region: rect(24px, 16px, 32px, 8px); -} - -.webconsole-msg-console.webconsole-msg-warn { - -moz-image-region: rect(24px, 24px, 32px, 16px); -} - -.webconsole-msg-console.webconsole-msg-info { - -moz-image-region: rect(24px, 32px, 32px, 24px); -} - -/* Input and output styles */ -.webconsole-msg-input > .webconsole-msg-icon-container, -.webconsole-msg-output > .webconsole-msg-icon-container { - border-left: solid #808080 6px; -} - -.webconsole-msg-input { - -moz-image-region: rect(24px, 40px, 32px, 32px); -} - -.webconsole-msg-output { - -moz-image-region: rect(24px, 48px, 32px, 40px); -} - -/* JSTerm Styles */ -.jsterm-input-node, -.jsterm-complete-node { - border: none; - padding: 0 0 0 16px; - -moz-appearance: none; -} - .jsterm-input-node { width: 98%; - background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16) no-repeat; -} - -:-moz-any(.jsterm-input-node, - .jsterm-complete-node) > .textbox-input-box > .textbox-textarea { - overflow-x: hidden; -} - -.jsterm-complete-node > .textbox-input-box > .textbox-textarea { - color: GrayText; -} - -.webconsole-msg-inspector iframe { - height: 7em; - margin-bottom: 15px; - -moz-margin-end: 15px; - border-radius: 4px; - box-shadow: 0 0 12px #dfdfdf; -} - -#webconsole-sidebar > tabs { - height: 0; - border: none; -} - -/* Security styles */ - -.webconsole-msg-security > .webconsole-msg-icon-container { - -moz-border-start: solid red 6px; -} - -.webconsole-filter-button[category="security"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#FF3030, #FF7D7D); - border-color: #D12C2C; -} - -.webconsole-msg-security.webconsole-msg-error { - -moz-image-region: rect(32px, 16px, 40px, 8px); -} - -.webconsole-msg-security.webconsole-msg-warn { - -moz-image-region: rect(32px, 24px, 40px, 16px); } diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index ad14cf7461e8..db5764548ede 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -131,7 +131,7 @@ browser.jar: skin/classic/browser/devtools/command-tilt.png (devtools/command-tilt.png) skin/classic/browser/devtools/alerticon-warning.png (devtools/alerticon-warning.png) skin/classic/browser/devtools/ruleview.css (devtools/ruleview.css) - skin/classic/browser/devtools/webconsole.css (devtools/webconsole.css) +* skin/classic/browser/devtools/webconsole.css (devtools/webconsole.css) skin/classic/browser/devtools/webconsole_networkpanel.css (devtools/webconsole_networkpanel.css) skin/classic/browser/devtools/webconsole.png (devtools/webconsole.png) skin/classic/browser/devtools/checkbox-dark.png (devtools/checkbox-dark.png) diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index a1e69e9a987c..cf5aeccb5aa4 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -3563,12 +3563,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { color: hsl(210,11%,16%); } -/* Web Console */ - -.web-console-frame { - border-bottom: 1px solid #aaa; -} - /* Developer Toolbar */ #developer-toolbar-closebutton { diff --git a/browser/themes/osx/devtools/webconsole.css b/browser/themes/osx/devtools/webconsole.css index c627641e4681..3fcfd5640e0f 100644 --- a/browser/themes/osx/devtools/webconsole.css +++ b/browser/themes/osx/devtools/webconsole.css @@ -3,274 +3,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ %include ../shared.inc +%include ../../shared/devtools/webconsole.inc.css /* General output styles */ -.webconsole-timestamp { - color: GrayText; - margin-top: 0; - margin-bottom: 0; - font-family: Menlo, Monaco, monospace; -} - -.hud-msg-node { - list-style-image: url(chrome://browser/skin/devtools/webconsole.png); - -moz-image-region: rect(0, 1px, 0, 0); -} - -.webconsole-msg-icon { - margin: 3px 4px; - width: 8px; - height: 8px; -} - -.hud-clickable { - cursor: pointer; - text-decoration: underline; -} - +.webconsole-timestamp, .webconsole-msg-body { - margin-top: 0; - margin-bottom: 3px; - -moz-margin-start: 3px; - -moz-margin-end: 6px; - white-space: pre-wrap; font-family: Menlo, Monaco, monospace; } -.webconsole-msg-body-piece { - margin: 0; -} - -.webconsole-msg-url { - margin: 0 6px; -} - -/* Repeated messages */ -.webconsole-msg-repeat { - margin: 2px 0; - padding-left: 4px; - padding-right: 4px; - color: white; - background-color: red; - border-radius: 40px; - font: message-box; - font-size: 0.9em; - font-weight: 600; -} - -/* TODO move this and other functional rules to content - bug 635359 */ -.webconsole-msg-repeat[value="1"] { - display: none; -} - -.webconsole-location { - margin-top: 0; - margin-bottom: 0; - -moz-margin-start: 0; - -moz-margin-end: 6px; - width: 10em; - text-align: end; -} - -.hud-msg-node[selected="true"] > .webconsole-timestamp, -.hud-msg-node[selected="true"] > .webconsole-location { - color: inherit; -} - .jsterm-input-node, .jsterm-complete-node { font: 1em Menlo, Monaco, monospace; } - -.hud-output-node { - -moz-appearance: none; - border-bottom: 1px solid ThreeDShadow; - margin: 0; -} - -.hud-filtered-by-type, -.hud-filtered-by-string { - display: none; -} - -.hidden-message { - display: block; - visibility: hidden; - height: 0; - overflow: hidden; -} - -/* WebConsole colored drops */ - -.webconsole-filter-button { - -moz-user-focus: normal; -} - -.webconsole-filter-button[checked] { - color: white !important; -} - -.webconsole-filter-button > .toolbarbutton-menubutton-button:before { - content: ""; - display: inline-block; - height: 8px; - width: 8px; - border-radius: 50%; - margin-left: 5px; - border-width: 1px; - border-style: solid; -} - -/* Network styles */ -.webconsole-filter-button[category="net"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#444444, #000000); - border-color: #777; -} - -.webconsole-msg-network > .webconsole-msg-icon-container { - -moz-border-start: solid #000 6px; -} - -.webconsole-msg-network.webconsole-msg-error { - -moz-image-region: rect(0, 16px, 8px, 8px); -} - -/* CSS styles */ -.webconsole-filter-button[category="css"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#2DC3F3, #00B6F0); - border-color: #1BA2CC; -} - -.webconsole-msg-cssparser > .webconsole-msg-icon-container { - -moz-border-start: solid #00b6f0 6px; -} - -.webconsole-msg-cssparser.webconsole-msg-error { - -moz-image-region: rect(8px, 16px, 16px, 8px); -} - -.webconsole-msg-cssparser.webconsole-msg-warn { - -moz-image-region: rect(8px, 24px, 16px, 16px); -} - -/* JS styles */ -.webconsole-filter-button[category="js"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#FCB142, #FB9500); - border-color: #E98A00; -} - -.webconsole-msg-exception > .webconsole-msg-icon-container { - -moz-border-start: solid #fb9500 6px; -} - -.webconsole-msg-exception.webconsole-msg-error { - -moz-image-region: rect(16px, 16px, 24px, 8px); -} - -.webconsole-msg-exception.webconsole-msg-warn { - -moz-image-region: rect(16px, 24px, 24px, 16px); -} - -/* Web Developer styles */ -.webconsole-filter-button[category="logging"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#B9B9B9, #AAAAAA); - border-color: #929292; -} - -.webconsole-msg-console > .webconsole-msg-icon-container { - -moz-border-start: solid #cbcbcb 6px; -} - -.webconsole-msg-console.webconsole-msg-error, -.webconsole-msg-output.webconsole-msg-error { - -moz-image-region: rect(24px, 16px, 32px, 8px); -} - -.webconsole-msg-console.webconsole-msg-warn { - -moz-image-region: rect(24px, 24px, 32px, 16px); -} - -.webconsole-msg-console.webconsole-msg-info { - -moz-image-region: rect(24px, 32px, 32px, 24px); -} - -.webconsole-mixed-content { - color: #FF0000; -} - -.webconsole-mixed-content-link { - color: #0000EE; - margin: 0; -} - -/* Input and output styles */ -.webconsole-msg-input > .webconsole-msg-icon-container, -.webconsole-msg-output > .webconsole-msg-icon-container { - border-left: solid #808080 6px; -} - -.webconsole-msg-input { - -moz-image-region: rect(24px, 40px, 32px, 32px); -} - -.webconsole-msg-output { - -moz-image-region: rect(24px, 48px, 32px, 40px); -} - -/* JSTerm Styles */ -.jsterm-input-container { - background: white; -} - -.jsterm-input-node, -.jsterm-complete-node { - border: none; - padding: 0 0 0 16px; - -moz-appearance: none; -} - -.jsterm-input-node { - background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16) no-repeat; -} - -:-moz-any(.jsterm-input-node, - .jsterm-complete-node) > .textbox-input-box > .textbox-textarea { - overflow-x: hidden; -} - -.jsterm-complete-node > .textbox-input-box > .textbox-textarea { - color: GrayText; -} - -.webconsole-msg-inspector iframe { - height: 7em; - margin-bottom: 15px; - -moz-margin-end: 15px; - border-radius: 4px; - box-shadow: 0 0 12px #dfdfdf; -} - -#webconsole-sidebar > tabs { - height: 0; - border: none; -} - -/* Security styles */ - -.webconsole-msg-security > .webconsole-msg-icon-container { - -moz-border-start: solid red 6px; -} - -.webconsole-filter-button[category="security"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#FF3030, #FF7D7D); - border-color: #D12C2C; -} - -.webconsole-msg-security.webconsole-msg-error { - -moz-image-region: rect(32px, 16px, 40px, 8px); -} - -.webconsole-msg-security.webconsole-msg-warn { - -moz-image-region: rect(32px, 24px, 40px, 16px); -} diff --git a/browser/themes/shared/devtools/webconsole.inc.css b/browser/themes/shared/devtools/webconsole.inc.css new file mode 100644 index 000000000000..1218d494f5b0 --- /dev/null +++ b/browser/themes/shared/devtools/webconsole.inc.css @@ -0,0 +1,269 @@ +/* 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/. */ + +/* General output styles */ + +.webconsole-timestamp { + color: GrayText; + margin-top: 0; + margin-bottom: 0; + font-family: monospace; +} + +.hud-msg-node { + list-style-image: url(chrome://browser/skin/devtools/webconsole.png); + -moz-image-region: rect(0, 1px, 0, 0); +} + +.webconsole-msg-icon { + margin: 3px 4px; + width: 8px; + height: 8px; +} + +.hud-clickable { + cursor: pointer; + text-decoration: underline; +} + +.webconsole-msg-body { + margin-top: 0; + margin-bottom: 3px; + -moz-margin-start: 3px; + -moz-margin-end: 6px; + white-space: pre-wrap; + font-family: monospace; +} + +.webconsole-msg-body-piece { + margin: 0; +} + +.webconsole-msg-url { + margin: 0 6px; +} + +/* Repeated messages */ +.webconsole-msg-repeat { + margin: 2px 0; + padding-left: 4px; + padding-right: 4px; + color: white; + background-color: red; + border-radius: 40px; + font: message-box; + font-size: 0.9em; + font-weight: 600; +} + +.webconsole-msg-repeat[value="1"] { + display: none; +} + +.webconsole-location { + margin-top: 0; + margin-bottom: 0; + -moz-margin-start: 0; + -moz-margin-end: 6px; + width: 10em; + text-align: end; +} + +.webconsole-mixed-content { + color: #FF0000; +} + +.webconsole-mixed-content-link { + color: #0000EE; + margin: 0; +} + +.hud-msg-node[selected="true"] > .webconsole-timestamp, +.hud-msg-node[selected="true"] > .webconsole-location { + color: inherit; +} + +.jsterm-input-node, +.jsterm-complete-node { + font-family: monospace; +} + +.hud-output-node { + -moz-appearance: none; + border-bottom: 1px solid ThreeDShadow; + margin: 0; +} + +.hud-filtered-by-type, +.hud-filtered-by-string { + display: none; +} + +.hidden-message { + display: block; + visibility: hidden; + height: 0; + overflow: hidden; +} + +/* WebConsole colored drops */ + +.webconsole-filter-button { + -moz-user-focus: normal; +} + +.webconsole-filter-button[checked] { + color: white !important; +} + +.webconsole-filter-button > .toolbarbutton-menubutton-button:before { + content: ""; + display: inline-block; + height: 8px; + width: 8px; + border-radius: 50%; + margin-left: 5px; + border-width: 1px; + border-style: solid; +} + +/* Network styles */ +.webconsole-filter-button[category="net"] > .toolbarbutton-menubutton-button:before { + background-image: linear-gradient(#444444, #000000); + border-color: #777; +} + +.webconsole-msg-network > .webconsole-msg-icon-container { + -moz-border-start: solid #000 6px; +} + +.webconsole-msg-network.webconsole-msg-error { + -moz-image-region: rect(0, 16px, 8px, 8px); +} + +/* CSS styles */ +.webconsole-filter-button[category="css"] > .toolbarbutton-menubutton-button:before { + background-image: linear-gradient(#2DC3F3, #00B6F0); + border-color: #1BA2CC; +} + +.webconsole-msg-cssparser > .webconsole-msg-icon-container { + -moz-border-start: solid #00b6f0 6px; +} + +.webconsole-msg-cssparser.webconsole-msg-error { + -moz-image-region: rect(8px, 16px, 16px, 8px); +} + +.webconsole-msg-cssparser.webconsole-msg-warn { + -moz-image-region: rect(8px, 24px, 16px, 16px); +} + +/* JS styles */ +.webconsole-filter-button[category="js"] > .toolbarbutton-menubutton-button:before { + background-image: linear-gradient(#FCB142, #FB9500); + border-color: #E98A00; +} + +.webconsole-msg-exception > .webconsole-msg-icon-container { + -moz-border-start: solid #fb9500 6px; +} + +.webconsole-msg-exception.webconsole-msg-error { + -moz-image-region: rect(16px, 16px, 24px, 8px); +} + +.webconsole-msg-exception.webconsole-msg-warn { + -moz-image-region: rect(16px, 24px, 24px, 16px); +} + +/* Web Developer styles */ +.webconsole-filter-button[category="logging"] > .toolbarbutton-menubutton-button:before { + background-image: linear-gradient(#B9B9B9, #AAAAAA); + border-color: #929292; +} + +.webconsole-msg-console > .webconsole-msg-icon-container { + -moz-border-start: solid #cbcbcb 6px; +} + +.webconsole-msg-console.webconsole-msg-error, +.webconsole-msg-output.webconsole-msg-error { + -moz-image-region: rect(24px, 16px, 32px, 8px); +} + +.webconsole-msg-console.webconsole-msg-warn { + -moz-image-region: rect(24px, 24px, 32px, 16px); +} + +.webconsole-msg-console.webconsole-msg-info { + -moz-image-region: rect(24px, 32px, 32px, 24px); +} + +/* Input and output styles */ +.webconsole-msg-input > .webconsole-msg-icon-container, +.webconsole-msg-output > .webconsole-msg-icon-container { + border-left: solid #808080 6px; +} + +.webconsole-msg-input { + -moz-image-region: rect(24px, 40px, 32px, 32px); +} + +.webconsole-msg-output { + -moz-image-region: rect(24px, 48px, 32px, 40px); +} + +/* JSTerm Styles */ +.jsterm-input-node, +.jsterm-complete-node { + border: none; + padding: 0 0 0 16px; + -moz-appearance: none; +} + +.jsterm-input-node { + background: url("chrome://browser/skin/devtools/commandline.png") 4px 3px no-repeat; +} + +:-moz-any(.jsterm-input-node, + .jsterm-complete-node) > .textbox-input-box > .textbox-textarea { + overflow-x: hidden; +} + +.jsterm-complete-node > .textbox-input-box > .textbox-textarea { + color: GrayText; +} + +.webconsole-msg-inspector iframe { + height: 7em; + margin-bottom: 15px; + -moz-margin-end: 15px; + border-radius: 4px; + box-shadow: 0 0 12px #dfdfdf; +} + +#webconsole-sidebar > tabs { + height: 0; + border: none; +} + +/* Security styles */ + +.webconsole-msg-security > .webconsole-msg-icon-container { + -moz-border-start: solid red 6px; +} + +.webconsole-filter-button[category="security"] > .toolbarbutton-menubutton-button:before { + background-image: linear-gradient(#FF3030, #FF7D7D); + border-color: #D12C2C; +} + +.webconsole-msg-security.webconsole-msg-error { + -moz-image-region: rect(32px, 16px, 40px, 8px); +} + +.webconsole-msg-security.webconsole-msg-warn { + -moz-image-region: rect(32px, 24px, 40px, 16px); +} diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 2a12568e5e5b..4d61636b0975 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -2797,12 +2797,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { %include ../shared/devtools/highlighter.inc.css %include ../shared/devtools/commandline.inc.css -/* Web Console */ - -.web-console-frame { - border-bottom: 1px solid #aaa; -} - /* Error counter */ #developer-toolbar-toolbox-button[error-count]:before { diff --git a/browser/themes/windows/devtools/webconsole.css b/browser/themes/windows/devtools/webconsole.css index 5a07960dfd80..3daf77ca7687 100644 --- a/browser/themes/windows/devtools/webconsole.css +++ b/browser/themes/windows/devtools/webconsole.css @@ -2,243 +2,15 @@ * 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/. */ -/* General output styles */ - -.webconsole-timestamp { - color: GrayText; - margin-top: 0; - margin-bottom: 0; - font-family: Consolas, Lucida Console, monospace; -} - -.hud-msg-node { - list-style-image: url(chrome://browser/skin/devtools/webconsole.png); - -moz-image-region: rect(0, 1px, 0, 0); -} - -.webconsole-msg-icon { - margin: 3px 4px; - width: 8px; - height: 8px; -} - -.hud-clickable { - cursor: pointer; - text-decoration: underline; -} - -.webconsole-msg-body { - margin-top: 0; - margin-bottom: 3px; - -moz-margin-start: 3px; - -moz-margin-end: 6px; - white-space: pre-wrap; - font-family: Consolas, Lucida Console, monospace; -} - -.webconsole-msg-body-piece { - margin: 0; -} - -.webconsole-msg-url { - margin: 0 6px; -} - -/* Repeated messages */ -.webconsole-msg-repeat { - margin: 2px 0; - padding-left: 4px; - padding-right: 4px; - color: white; - background-color: red; - border-radius: 40px; - font: message-box; - font-size: 0.9em; - font-weight: 600; -} - -/* TODO move this and other functional rules to content - bug 635359 */ -.webconsole-msg-repeat[value="1"] { - display: none; -} - -.webconsole-location { - margin-top: 0; - margin-bottom: 0; - -moz-margin-start: 0; - -moz-margin-end: 6px; - width: 10em; - text-align: end; -} - -.hud-msg-node[selected="true"] > .webconsole-timestamp, -.hud-msg-node[selected="true"] > .webconsole-location { - color: inherit; -} +%include ../../shared/devtools/webconsole.inc.css +.webconsole-timestamp, +.webconsole-msg-body, .jsterm-input-node, .jsterm-complete-node { font-family: Consolas, Lucida Console, monospace; } -.hud-output-node { - -moz-appearance: none; - border-bottom: 1px solid ThreeDShadow; - margin: 0; -} - -.hud-filtered-by-type, -.hud-filtered-by-string { - display: none; -} - -.hidden-message { - display: block; - visibility: hidden; - height: 0; - overflow: hidden; -} - -/* WebConsole colored drops */ - -.webconsole-filter-button { - -moz-user-focus: normal; -} - -.webconsole-filter-button[checked] { - color: white !important; -} - -.webconsole-filter-button > .toolbarbutton-menubutton-button:before { - content: ""; - display: inline-block; - height: 8px; - width: 8px; - border-radius: 50%; - margin-left: 5px; - border-width: 1px; - border-style: solid; -} - -/* Network styles */ -.webconsole-filter-button[category="net"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#444444, #000000); - border-color: #777; -} - -.webconsole-msg-network > .webconsole-msg-icon-container { - -moz-border-start: solid #000 6px; -} - -.webconsole-msg-network.webconsole-msg-error { - -moz-image-region: rect(0, 16px, 8px, 8px); -} - -/* CSS styles */ -.webconsole-filter-button[category="css"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#2DC3F3, #00B6F0); - border-color: #1BA2CC; -} - -.webconsole-msg-cssparser > .webconsole-msg-icon-container { - -moz-border-start: solid #00b6f0 6px; -} - -.webconsole-msg-cssparser.webconsole-msg-error { - -moz-image-region: rect(8px, 16px, 16px, 8px); -} - -.webconsole-msg-cssparser.webconsole-msg-warn { - -moz-image-region: rect(8px, 24px, 16px, 16px); -} - -/* JS styles */ -.webconsole-filter-button[category="js"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#FCB142, #FB9500); - border-color: #E98A00; -} - -.webconsole-msg-exception > .webconsole-msg-icon-container { - -moz-border-start: solid #fb9500 6px; -} - -.webconsole-msg-exception.webconsole-msg-error { - -moz-image-region: rect(16px, 16px, 24px, 8px); -} - -.webconsole-msg-exception.webconsole-msg-warn { - -moz-image-region: rect(16px, 24px, 24px, 16px); -} - -/* Web Developer styles */ -.webconsole-filter-button[category="logging"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#B9B9B9, #AAAAAA); - border-color: #929292; -} - -.webconsole-msg-console > .webconsole-msg-icon-container { - -moz-border-start: solid #cbcbcb 6px; -} - -.webconsole-msg-console.webconsole-msg-error, -.webconsole-msg-output.webconsole-msg-error { - -moz-image-region: rect(24px, 16px, 32px, 8px); -} - -.webconsole-msg-console.webconsole-msg-warn { - -moz-image-region: rect(24px, 24px, 32px, 16px); -} - -.webconsole-msg-console.webconsole-msg-info { - -moz-image-region: rect(24px, 32px, 32px, 24px); -} - -.webconsole-mixed-content { - color: #FF0000; -} - -.webconsole-mixed-content-link { - color: #0000EE; - margin: 0; -} - -/* Input and output styles */ -.webconsole-msg-input > .webconsole-msg-icon-container, -.webconsole-msg-output > .webconsole-msg-icon-container { - border-left: solid #808080 6px; -} - -.webconsole-msg-input { - -moz-image-region: rect(24px, 40px, 32px, 32px); -} - -.webconsole-msg-output { - -moz-image-region: rect(24px, 48px, 32px, 40px); -} - -/* JSTerm Styles */ -.jsterm-input-node, -.jsterm-complete-node { - border: none; - padding: 0 0 0 16px; - -moz-appearance: none; -} - -.jsterm-input-node { - background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16) no-repeat; -} - -:-moz-any(.jsterm-input-node, - .jsterm-complete-node) > .textbox-input-box > .textbox-textarea { - overflow-x: hidden; -} - -.jsterm-complete-node > .textbox-input-box > .textbox-textarea { - color: GrayText; -} - -/* Filter */ - /* * This hardcoded width likely due to a toolkit Windows specific bug. * See http://hg.mozilla.org/mozilla-central/annotate/f38d6df93cad/toolkit/themes/winstripe/global/textbox-aero.css#l7 @@ -247,35 +19,3 @@ .hud-filter-box { width: 200px; } - -.webconsole-msg-inspector iframe { - height: 7em; - margin-bottom: 15px; - -moz-margin-end: 15px; - border-radius: 4px; - box-shadow: 0 0 12px #dfdfdf; -} - -#webconsole-sidebar > tabs { - height: 0; - border: none; -} - -/* Security styles */ - -.webconsole-msg-security > .webconsole-msg-icon-container { - -moz-border-start: solid red 6px; -} - -.webconsole-filter-button[category="security"] > .toolbarbutton-menubutton-button:before { - background-image: linear-gradient(#FF3030, #FF7D7D); - border-color: #D12C2C; -} - -.webconsole-msg-security.webconsole-msg-error { - -moz-image-region: rect(32px, 16px, 40px, 8px); -} - -.webconsole-msg-security.webconsole-msg-warn { - -moz-image-region: rect(32px, 24px, 40px, 16px); -} diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 0d134b7b8e7b..73c643a4c678 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -166,7 +166,7 @@ browser.jar: skin/classic/browser/devtools/orion-task.png (devtools/orion-task.png) skin/classic/browser/devtools/orion-breakpoint.png (devtools/orion-breakpoint.png) skin/classic/browser/devtools/orion-debug-location.png (devtools/orion-debug-location.png) - skin/classic/browser/devtools/webconsole.css (devtools/webconsole.css) +* skin/classic/browser/devtools/webconsole.css (devtools/webconsole.css) skin/classic/browser/devtools/webconsole_networkpanel.css (devtools/webconsole_networkpanel.css) skin/classic/browser/devtools/webconsole.png (devtools/webconsole.png) skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (devtools/breadcrumbs-scrollbutton.png) @@ -417,7 +417,7 @@ browser.jar: skin/classic/aero/browser/devtools/orion-task.png (devtools/orion-task.png) skin/classic/aero/browser/devtools/orion-breakpoint.png (devtools/orion-breakpoint.png) skin/classic/aero/browser/devtools/orion-debug-location.png (devtools/orion-debug-location.png) - skin/classic/aero/browser/devtools/webconsole.css (devtools/webconsole.css) +* skin/classic/aero/browser/devtools/webconsole.css (devtools/webconsole.css) skin/classic/aero/browser/devtools/webconsole_networkpanel.css (devtools/webconsole_networkpanel.css) skin/classic/aero/browser/devtools/webconsole.png (devtools/webconsole.png) skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton.png (devtools/breadcrumbs-scrollbutton.png)