Merge pull request #2367 from thelounge/astorije/quickfix-tooltips

Quick-fix tooltips not being loaded by Webpack
This commit is contained in:
Pavel Djundik 2018-04-18 10:14:22 +03:00 committed by GitHub
commit e254f76459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions

View File

@ -1,6 +1,5 @@
@import "fontawesome.css"; @import "fontawesome.css";
@import "bootstrap.css"; @import "bootstrap.css";
@import "../../node_modules/primer-tooltips/build/build.css";
:root { :root {
/* Links and link-looking buttons */ /* Links and link-looking buttons */

View File

@ -7,6 +7,8 @@
<link rel="preload" as="script" href="js/bundle.vendor.js"> <link rel="preload" as="script" href="js/bundle.vendor.js">
<link rel="preload" as="script" href="js/bundle.js"> <link rel="preload" as="script" href="js/bundle.js">
<link rel="stylesheet" href="css/primer-tooltips.css">
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
<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) { %>

View File

@ -114,6 +114,10 @@ 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]",
},
]), ]),
// socket.io uses debug, we don't need it // socket.io uses debug, we don't need it
new webpack.NormalModuleReplacementPlugin(/debug/, path.resolve(__dirname, "scripts/noop.js")), new webpack.NormalModuleReplacementPlugin(/debug/, path.resolve(__dirname, "scripts/noop.js")),