diff --git a/devtools/client/jsonview/components/headers.js b/devtools/client/jsonview/components/headers.js index a11558f..4ed2dba 100644 --- a/devtools/client/jsonview/components/headers.js +++ b/devtools/client/jsonview/components/headers.js @@ -87,9 +87,7 @@ define(function (require, exports, module) { td({className: "netInfoParamName"}, span({title: header.name}, header.name) ), - td({className: "netInfoParamValue"}, - code({}, header.value) - ) + td({className: "netInfoParamValue"}, header.value) ) ); }); diff --git a/devtools/client/jsonview/converter-child.js b/devtools/client/jsonview/converter-child.js index 1978e6c..15fd0bb 100644 --- a/devtools/client/jsonview/converter-child.js +++ b/devtools/client/jsonview/converter-child.js @@ -212,8 +212,18 @@ let Converter = Class({ let themeVarsUrl = clientBaseUrl + "themes/variables.css"; let commonUrl = clientBaseUrl + "themes/common.css"; + let os; + let platform = Services.appinfo.OS; + if (platform.startsWith("WINNT")) { + os = "win"; + } else if (platform.startsWith("Darwin")) { + os = "mac"; + } else { + os = "linux"; + } + return "\n" + - "" + + "" + "" + this.htmlEncode(title) + "" + "" + " .treeLabelCell > .treeIcon { +/* Light, Firebug Theme: toggle icon */ +.theme-light .treeTable .treeRow.hasChildren > .treeLabelCell > .treeIcon, +.theme-firebug .treeTable .treeRow.hasChildren > .treeLabelCell > .treeIcon { background-image: url(chrome://devtools/skin/images/controls.png); background-size: 56px 28px; background-position: 0 -14px; } -.theme-light .treeTable .treeRow.hasChildren.opened > .treeLabelCell > .treeIcon { +.theme-light .treeTable .treeRow.hasChildren.opened > .treeLabelCell > .treeIcon, +.theme-firebug .treeTable .treeRow.hasChildren.opened > .treeLabelCell > .treeIcon { background-image: url(chrome://devtools/skin/images/controls.png); background-size: 56px 28px; background-position: -14px -14px; @@ -158,11 +160,10 @@ background-position: -42px -14px; } -/* Dark and Light Themes: Support for retina displays */ +/* Support for retina displays */ @media (min-resolution: 1.1dppx) { - .theme-dark .treeTable .treeRow.hasChildren > .treeLabelCell > .treeIcon, - .theme-light .treeTable .treeRow.hasChildren > .treeLabelCell > .treeIcon { - background-image: url("chrome://devtools/skin/images/controls@2x.png"); + .treeTable .treeRow.hasChildren > .treeLabelCell > .treeIcon { + background-image: url("chrome://devtools/skin/images/controls@2x.png") !important; } } diff --git a/devtools/client/themes/common.css b/devtools/client/themes/common.css index 5d92220..a0d51a7 100644 --- a/devtools/client/themes/common.css +++ b/devtools/client/themes/common.css @@ -18,7 +18,7 @@ :root[platform="linux"], :root.theme-firebug { - --monospace-font-family: monospace; + --monospace-font-family: DejaVu Sans Mono, monospace; } :root.theme-firebug {