mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1311178 - Expose some DevTools CSS as resource:// only. r=ntim 

For CSS files which were used via both chrome:// and resource://, I converted
all usages to resource:// and removed the chrome:// copy to reduce file
duplication.

I believe most DevTools CSS could be using resource:// throughout, but that's
left as follow up work for now.

MozReview-Commit-ID: G7oxZqjodwv

--HG--
extra : rebase_source : d6ae487f35cdeddd32aa96d95d62113ba0565b2a
This commit is contained in:
J. Ryan Stinnett 2016-10-19 16:19:29 -05:00
Родитель 137f7ec3ea
Коммит 5d51f47dfb
18 изменённых файлов: 29 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
browser/base/content/test/general/browser_parsable_css.js
Просмотреть файл

@ -53,11 +53,6 @@ let allowedImageReferences = [
{file: "chrome://devtools/skin/images/dock-bottom-maximize@2x.png",
from: "chrome://devtools/skin/toolbox.css",
isFromDevTools: true},
// Bug 1302708
{file: "chrome/devtools/modules/devtools/client/themes/images/filter.svg",
from: "chrome/devtools/modules/devtools/client/themes/common.css",
isFromDevTools: true},
];
var moduleLocation = gTestPath.replace(/\/[^\/]*$/i, "/parsingTestHelpers.jsm");

3
devtools/client/jar.mn
Просмотреть файл

@ -135,15 +135,12 @@ devtools.jar:
content/dom/main.js (dom/main.js)
% skin devtools classic/1.0 %skin/
skin/devtools-browser.css (themes/devtools-browser.css)
skin/common.css (themes/common.css)
skin/splitters.css (themes/splitters.css)
skin/dark-theme.css (themes/dark-theme.css)
skin/light-theme.css (themes/light-theme.css)
skin/firebug-theme.css (themes/firebug-theme.css)
skin/toolbars.css (themes/toolbars.css)
skin/toolbox.css (themes/toolbox.css)
skin/tooltips.css (themes/tooltips.css)
skin/variables.css (themes/variables.css)
skin/images/add.svg (themes/images/add.svg)
skin/images/filters.svg (themes/images/filters.svg)
skin/images/filter-swatch.svg (themes/images/filter-swatch.svg)

2
devtools/client/projecteditor/chrome/content/projecteditor.xul
Просмотреть файл

@ -5,7 +5,7 @@
<?xml-stylesheet href="chrome://devtools/skin/light-theme.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/projecteditor/projecteditor.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/content/debugger/debugger.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
<?xml-stylesheet href="resource://devtools/client/themes/common.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/markup.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>

2
devtools/client/shared/components/test/mochitest/test_HSplitBox_01.html
Просмотреть файл

@ -9,7 +9,7 @@ Basic tests for the HSplitBox component.
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript "src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
<link rel="stylesheet" href="chrome://devtools/skin/splitters.css" type="text/css"/>
<link rel="stylesheet" href="resource://devtools/client/themes/splitters.css" type="text/css"/>
<link rel="stylesheet" href="chrome://devtools/skin/components-h-split-box.css" type="text/css"/>
<style>
html {

2
devtools/client/shared/test/browser_html_tooltip_hover.js
Просмотреть файл

@ -11,7 +11,7 @@
const HTML_NS = "http://www.w3.org/1999/xhtml";
const TEST_URI = `data:text/xml;charset=UTF-8,<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://devtools/skin/variables.css"?>
<?xml-stylesheet href="resource://devtools/client/themes/variables.css"?>
<?xml-stylesheet href="chrome://devtools/skin/tooltips.css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="theme-light" title="Tooltip hover test">

2
devtools/client/shared/test/browser_inplace-editor_autocomplete_offset.js
Просмотреть файл

@ -11,7 +11,7 @@ loadHelperScript("helper_inplace_editor.js");
const TEST_URI = `data:text/xml;charset=UTF-8,<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://devtools/skin/common.css"?>
<?xml-stylesheet href="resource://devtools/client/themes/common.css"?>
<?xml-stylesheet href="chrome://devtools/skin/tooltips.css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="Tooltip test">

4
devtools/client/themes/common.css
Просмотреть файл

@ -2,7 +2,7 @@
* 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/. */
@import url("splitters.css");
@import url("resource://devtools/client/themes/splitters.css");
:root {
font: message-box;
@ -554,7 +554,7 @@ checkbox:-moz-focusring {
}
.devtools-filterinput {
background-image: url(images/filter.svg#filterinput);
background-image: url(chrome://devtools/skin/images/filter.svg#filterinput);
}
.devtools-searchinput:-moz-locale-dir(rtl),

4
devtools/client/themes/dark-theme.css
Просмотреть файл

@ -3,8 +3,8 @@
* 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/. */
@import url(variables.css);
@import url(common.css);
@import url(resource://devtools/client/themes/variables.css);
@import url(resource://devtools/client/themes/common.css);
@import url(toolbars.css);
@import url(tooltips.css);

3
devtools/client/themes/devtools-browser.css
Просмотреть файл

@ -2,7 +2,7 @@
* 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/. */
@import url("splitters.css");
@import url("resource://devtools/client/themes/splitters.css");
/* Bottom-docked toolbox minimize transition */
.devtools-toolbox-bottom-iframe {
@ -24,4 +24,3 @@
background-color: transparent;
border: none;
}

4
devtools/client/themes/firebug-theme.css
Просмотреть файл

@ -3,8 +3,8 @@
* 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/. */
@import url(variables.css);
@import url(common.css);
@import url(resource://devtools/client/themes/variables.css);
@import url(resource://devtools/client/themes/common.css);
@import url(light-theme.css);
:root {

4
devtools/client/themes/light-theme.css
Просмотреть файл

@ -3,8 +3,8 @@
* 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/. */
@import url(variables.css);
@import url(common.css);
@import url(resource://devtools/client/themes/variables.css);
@import url(resource://devtools/client/themes/common.css);
@import url(toolbars.css);
@import url(tooltips.css);

1
devtools/client/themes/moz.build
Просмотреть файл

@ -10,5 +10,6 @@ DIRS += [
DevToolsModules(
'common.css',
'splitters.css',
'variables.css',
)

2
devtools/client/themes/performance.css
Просмотреть файл

@ -58,7 +58,7 @@
}
#filter-button {
list-style-image: url(images/filter.svg);
list-style-image: url(chrome://devtools/skin/images/filter.svg);
}
#performance-filter-menupopup > menuitem .menu-iconic-left::after {

2
devtools/client/themes/rules.css
Просмотреть файл

@ -309,7 +309,7 @@
}
.ruleview-overridden-rule-filter {
background-image: url(images/filter.svg#filterinput);
background-image: url(chrome://devtools/skin/images/filter.svg#filterinput);
background-size: 11px 11px;
margin-inline-start: 5px;
display: inline-block;

2
devtools/client/themes/shims/common.css
Просмотреть файл

@ -7,4 +7,4 @@
* specific path.
*/
@import url("chrome://devtools/skin/common.css");
@import url("resource://devtools/client/themes/common.css");

20
devtools/client/themes/toolbars.css
Просмотреть файл

@ -11,11 +11,11 @@
--searchbox-border-color: #ffbf00;
--searcbox-no-match-background-color: #ffe5e5;
--searcbox-no-match-border-color: #e52e2e;
--magnifying-glass-image: url(images/search.svg);
--filter-image: url(images/filter.svg);
--tool-options-image: url(images/tool-options.svg);
--magnifying-glass-image: url(chrome://devtools/skin/images/search.svg);
--filter-image: url(chrome://devtools/skin/images/filter.svg);
--tool-options-image: url(chrome://devtools/skin/images/tool-options.svg);
--icon-filter: none;
--checked-icon-filter: url(images/filters.svg#checked-icon-state);
--checked-icon-filter: url(chrome://devtools/skin/images/filters.svg#checked-icon-state);
--toolbar-button-border-color: rgba(170, 170, 170, .5);
}
@ -26,17 +26,17 @@
--searchbox-border-color: #d99f2b;
--searcbox-no-match-background-color: #402325;
--searcbox-no-match-border-color: #cc3d3d;
--magnifying-glass-image: url(images/search.svg);
--filter-image: url(images/filter.svg);
--tool-options-image: url(images/tool-options.svg);
--magnifying-glass-image: url(chrome://devtools/skin/images/search.svg);
--filter-image: url(chrome://devtools/skin/images/filter.svg);
--tool-options-image: url(chrome://devtools/skin/images/tool-options.svg);
--icon-filter: invert(1);
--checked-icon-filter: url(images/filters.svg#dark-theme-checked-icon-state);
--checked-icon-filter: url(chrome://devtools/skin/images/filters.svg#dark-theme-checked-icon-state);
--toolbar-button-border-color: rgba(0, 0, 0, .4);
}
.theme-firebug {
--magnifying-glass-image: url(images/search.svg);
--tool-options-image: url(images/firebug/tool-options.svg);
--magnifying-glass-image: url(chrome://devtools/skin/images/search.svg);
--tool-options-image: url(chrome://devtools/skin/images/firebug/tool-options.svg);
--icon-filter: none;
--checked-icon-filter: none;
--toolbar-button-border-color: rgba(170, 170, 170, .5);

2
devtools/client/webide/content/logs.xhtml
Просмотреть файл

@ -13,7 +13,7 @@
<head>
<meta charset="utf8"/>
<link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
<link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
<link rel="stylesheet" href="resource://devtools/client/themes/common.css" type="text/css"/>
<link rel="stylesheet" href="chrome://webide/skin/logs.css" type="text/css"/>
<script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"></script>
<script type="application/javascript;version=1.8" src="logs.js"></script>

2
devtools/client/webide/content/webide.xul
Просмотреть файл

@ -12,7 +12,7 @@
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://devtools/skin/common.css"?>
<?xml-stylesheet href="resource://devtools/client/themes/common.css"?>
<?xml-stylesheet href="chrome://webide/skin/webide.css"?>
<window id="webide" onclose="return UI.canCloseProject();"