diff --git a/ui/assets/images/laser-spinner.png b/ui/assets/images/laser-spinner.png new file mode 100644 index 000000000..5287a82c6 Binary files /dev/null and b/ui/assets/images/laser-spinner.png differ diff --git a/ui/package.json b/ui/package.json index b2c55a86e..3bd3af5f6 100644 --- a/ui/package.json +++ b/ui/package.json @@ -99,6 +99,7 @@ "react-sparklines": "^1.4.2", "redux": "^3.3.1", "redux-thunk": "^1.0.3", + "resolve-url-loader": "^1.6.0", "updeep": "^0.13.0" } } diff --git a/ui/src/style/chronograf/components/_Visualization.scss b/ui/src/style/chronograf/components/_Visualization.scss index 955c6ee83..21e6e4c08 100644 --- a/ui/src/style/chronograf/components/_Visualization.scss +++ b/ui/src/style/chronograf/components/_Visualization.scss @@ -130,7 +130,7 @@ $dygraphs-legend-offset: 32px; &__spinner { width: 121px; height: 121px; - background-image: url(/assets/images/laser-spinner.png); + background-image: url(assets/images/laser-spinner.png); background-size: 100% 100%; background-position: center center; background-repeat: no-repeat; @@ -139,7 +139,7 @@ $dygraphs-legend-offset: 32px; &__spinner--small { width: 38px; height: 38px; - background-image: url(/assets/images/laser-spinner.png); + background-image: url(assets/images/laser-spinner.png); background-size: 100% 100%; background-position: center center; background-repeat: no-repeat; @@ -263,4 +263,4 @@ $dygraphs-legend-offset: 32px; font-weight: 600; } } -} \ No newline at end of file +} diff --git a/ui/src/style/enterprise_style/application.scss b/ui/src/style/enterprise_style/application.scss index 45e48c5eb..dd24795ac 100644 --- a/ui/src/style/enterprise_style/application.scss +++ b/ui/src/style/enterprise_style/application.scss @@ -18,4 +18,4 @@ // components. There's likely a better fix, but this does for now. @import '../_OverviewPage'; @import '../chronograf/main'; -@import '../_SideNav'; \ No newline at end of file +@import '../_SideNav'; diff --git a/ui/webpack/devConfig.js b/ui/webpack/devConfig.js index a5452352a..aee80b8cd 100644 --- a/ui/webpack/devConfig.js +++ b/ui/webpack/devConfig.js @@ -36,16 +36,15 @@ module.exports = { }, { test: /\.scss$/, - //loader: 'style!css!sass', - loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader'), + loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader!resolve-url!sass?sourceMap'), }, { test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader!postcss-loader'), }, { - test : /\.(ttf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/, - loader : 'file-loader', + test : /\.(png|jpg|ttf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/, + loader : 'file', }, { test: /\.js$/,