search

paritytech / parity-extension

Parity Chrome Extension
GNU General Public License v3.0
37 stars 14 forks source link

Welcome Page #97

Closed tomusdrw closed 7 years ago

tomusdrw commented 7 years ago

Closes #96

ngotchac commented 7 years ago

I suggest something around these lines : 

diff --git a/webpack.config.js b/webpack.config.js
index ddf8816..78509a9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -50,6 +50,11 @@ module.exports = {
   module: {
     rules: [
       {
+        test: /welcome\.css/,
+        loader: 'file-loader?name=[path][name].[ext]'
+      },
+
+      {
         test: /\.js$/,
         exclude: /(node_modules)/,
         use: 'babel-loader'
@@ -59,13 +64,13 @@ module.exports = {
         test: /\.html$/,
         use: [
           'file-loader?name=[path][name].[ext]',
-          'extract-loader?publicPath=./',
-          'html-loader'
+          'extract-loader?publicPath=../',
+          'html-loader?attrs[]=img:src&attrs[]=link:href'
         ]
       },
       {
         test: /\.css$/,
-        exclude: [ /node_modules/, /welcome.welcome\.css/ ],
+        exclude: [ /node_modules/, /welcome\.css/ ],
         use: [
           'style-loader',
           'css-loader?modules&sourceMap&importLoaders=1&localIdentName=[name]_[local]_[hash:base64:5]',
@@ -75,7 +80,7 @@ module.exports = {

       {
         test: /\.css$/,
-        include: [ /node_modules/, /welcome.welcome\.css/ ],
+        include: [ /node_modules/ ],
         use: [
           'style-loader',
           'css-loader'
diff --git a/welcome/index.html b/welcome/index.html
index 120f82b..70296cc 100644
--- a/welcome/index.html
+++ b/welcome/index.html
@@ -4,6 +4,7 @@
     <title>Parity Ethereum Integration | Parity Technologies</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
+    <link rel="stylesheet" href="./welcome.css">
     <script src="./index.js" async></script>
 </head>
 <body>
diff --git a/welcome/index.js b/welcome/index.js
index 3e4a216..7489b14 100644
--- a/welcome/index.js
+++ b/welcome/index.js
@@ -15,8 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 import './index.html';
-
-import './welcome.css';
 import '../assets/fonts/Roboto/font.css';

 import { browser } from '../shared';
tomusdrw commented 7 years ago

Updated :+1:

tomusdrw commented 7 years ago

Updated :+1: :)