Merge pull request #3493 from thelounge/xpaw/tooltips-import
Import primer-tooltips css
This commit is contained in:
commit
39213bc4e7
@ -1,5 +1,6 @@
|
||||
@import "fontawesome.css";
|
||||
@import "bootstrap.css";
|
||||
@import "../../node_modules/primer-tooltips/build/build.css";
|
||||
|
||||
:root {
|
||||
/* Main text color */
|
||||
|
@ -9,7 +9,6 @@
|
||||
<link rel="preload" as="script" href="js/bundle.vendor.js?v=<%- cacheBust %>">
|
||||
<link rel="preload" as="script" href="js/bundle.js?v=<%- cacheBust %>">
|
||||
|
||||
<link rel="stylesheet" href="css/primer-tooltips.css?v=<%- cacheBust %>">
|
||||
<link rel="stylesheet" href="css/style.css?v=<%- cacheBust %>">
|
||||
<link id="theme" rel="stylesheet" href="themes/<%- theme %>.css" data-server-theme="<%- theme %>">
|
||||
<% _.forEach(stylesheets, function(css) { %>
|
||||
|
@ -34,6 +34,19 @@ describe("public folder", function() {
|
||||
expect(fs.existsSync(path.join(publicFolder, "css", "style.css.map"))).to.be.true;
|
||||
});
|
||||
|
||||
it("style files contain expected content", function(done) {
|
||||
fs.readFile(path.join(publicFolder, "css", "style.css"), "utf8", function(err, contents) {
|
||||
expect(err).to.be.null;
|
||||
|
||||
expect(contents.includes("var(--body-color)")).to.be.true;
|
||||
expect(contents.includes("url(../fonts/fa-solid-900.woff2)")).to.be.true;
|
||||
expect(contents.includes(".tooltipped{position:relative}")).to.be.true;
|
||||
expect(contents.includes("sourceMappingURL")).to.be.true;
|
||||
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it("javascript map is created", function() {
|
||||
expect(fs.existsSync(path.join(publicFolder, "js", "bundle.js.map"))).to.be.true;
|
||||
});
|
||||
|
@ -134,10 +134,6 @@ const config = {
|
||||
from: "./client/themes/*",
|
||||
to: "themes/[name].[ext]",
|
||||
},
|
||||
{
|
||||
from: "./node_modules/primer-tooltips/build/build.css",
|
||||
to: "css/primer-tooltips.[ext]",
|
||||
},
|
||||
]),
|
||||
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
|
||||
// socket.io uses debug, we don't need it
|
||||
|
Loading…
Reference in New Issue
Block a user