supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3493 from thelounge/xpaw/tooltips-import

Browse Source 
Import primer-tooltips css
This commit is contained in:
Pavel Djundik 2019-11-05 12:35:06 +02:00 committed by GitHub
commit 39213bc4e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/css/style.css
View File

@ -1,5 +1,6 @@
@import "fontawesome.css"; @import "fontawesome.css";
@import "bootstrap.css"; @import "bootstrap.css";
@import "../../node_modules/primer-tooltips/build/build.css";
:root { :root {
/* Main text color */ /* Main text color */

1
client/index.html.tpl
View File

@ -9,7 +9,6 @@
<link rel="preload" as="script" href="js/bundle.vendor.js?v=<%- cacheBust %>"> <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="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 rel="stylesheet" href="css/style.css?v=<%- cacheBust %>">
<link id="theme" rel="stylesheet" href="themes/<%- theme %>.css" data-server-theme="<%- theme %>"> <link id="theme" rel="stylesheet" href="themes/<%- theme %>.css" data-server-theme="<%- theme %>">
<% _.forEach(stylesheets, function(css) { %> <% _.forEach(stylesheets, function(css) { %>

13
test/tests/build.js
View File

@ -34,6 +34,19 @@ describe("public folder", function() {
expect(fs.existsSync(path.join(publicFolder, "css", "style.css.map"))).to.be.true; 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() { it("javascript map is created", function() {
expect(fs.existsSync(path.join(publicFolder, "js", "bundle.js.map"))).to.be.true; expect(fs.existsSync(path.join(publicFolder, "js", "bundle.js.map"))).to.be.true;
}); });

4
webpack.config.js
View File

@ -134,10 +134,6 @@ const config = {
from: "./client/themes/*", from: "./client/themes/*",
to: "themes/[name].[ext]", to: "themes/[name].[ext]",
}, },
{
from: "./node_modules/primer-tooltips/build/build.css",
to: "css/primer-tooltips.[ext]",
},
]), ]),
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/), new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
// socket.io uses debug, we don't need it // socket.io uses debug, we don't need it