Bug 1654258: Package all activity-stream css files and load them using the internal chrome: protocol. r=mconley,k88hudson

Differential Revision: https://phabricator.services.mozilla.com/D85022
This commit is contained in:
Christoph Kerschbaumer 2020-07-30 06:06:54 +00:00
parent fd6ca4ec31
commit 656413d780
6 changed files with 9 additions and 8 deletions

View File

@ -62,7 +62,7 @@ function templateHTML(options) {
<link rel="localization" href="browser/branding/brandings.ftl" />
<link rel="localization" href="browser/newtab/newtab.ftl" />
<link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
<link rel="stylesheet" href="${options.baseUrl}css/activity-stream.css" />
<link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
</head>
<body class="activity-stream">
<div id="header-asrouter-container" role="presentation"></div>

View File

@ -29,7 +29,7 @@
<link rel="localization" href="browser/branding/brandings.ftl" />
<link rel="localization" href="browser/newtab/newtab.ftl" />
<link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
<link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
<link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
</head>
<!-- Cached: {{ CACHE_TIME }} -->
<body class="activity-stream">

View File

@ -4,6 +4,7 @@
browser.jar:
% resource activity-stream %res/activity-stream/ contentaccessible=yes
% content activity-stream %content/activity-stream/ contentaccessible=yes
res/activity-stream/lib/ (./lib/*)
res/activity-stream/common/ (./common/*)
res/activity-stream/aboutwelcome/ (./aboutwelcome/content/*)
@ -28,11 +29,11 @@ browser.jar:
res/activity-stream/data/content/newtab-render.js (./data/content/newtab-render.js)
res/activity-stream/data/custom-elements/ (./components/CustomElements/*)
#ifdef XP_MACOSX
res/activity-stream/css/activity-stream.css (./css/activity-stream-mac.css)
content/activity-stream/css/activity-stream.css (./css/activity-stream-mac.css)
#elifdef XP_WIN
res/activity-stream/css/activity-stream.css (./css/activity-stream-windows.css)
content/activity-stream/css/activity-stream.css (./css/activity-stream-windows.css)
#else
res/activity-stream/css/activity-stream.css (./css/activity-stream-linux.css)
content/activity-stream/css/activity-stream.css (./css/activity-stream-linux.css)
#endif
res/activity-stream/prerendered/activity-stream.html (./prerendered/activity-stream.html)
#ifndef RELEASE_OR_BETA

View File

@ -13,7 +13,7 @@
<link rel="localization" href="browser/branding/brandings.ftl" />
<link rel="localization" href="browser/newtab/newtab.ftl" />
<link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
<link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
<link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
</head>
<body class="activity-stream">
<div id="header-asrouter-container" role="presentation"></div>

View File

@ -13,7 +13,7 @@
<link rel="localization" href="browser/branding/brandings.ftl" />
<link rel="localization" href="browser/newtab/newtab.ftl" />
<link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
<link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
<link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
</head>
<body class="activity-stream">
<div id="header-asrouter-container" role="presentation"></div>

View File

@ -13,7 +13,7 @@
<link rel="localization" href="browser/branding/brandings.ftl" />
<link rel="localization" href="browser/newtab/newtab.ftl" />
<link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
<link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
<link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
</head>
<body class="activity-stream">
<div id="header-asrouter-container" role="presentation"></div>