Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #136 from influxdata/feature/static-assets 

Allow import of static png and jpg in scss
pull/10616/head
Andrew Watkins 2016-09-27 16:15:07 -07:00 committed by GitHub
parent 1981be5138 9a0aa08810
commit 8210a56ad0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ui/assets/images/laser-spinner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

1
ui/package.json
View File

@ -99,6 +99,7 @@
"react-sparklines": "^1.4.2", "react-sparklines": "^1.4.2",
"redux": "^3.3.1", "redux": "^3.3.1",
"redux-thunk": "^1.0.3", "redux-thunk": "^1.0.3",
"resolve-url-loader": "^1.6.0",
"updeep": "^0.13.0" "updeep": "^0.13.0"
} }
} }

6
ui/src/style/chronograf/components/_Visualization.scss
View File

@ -130,7 +130,7 @@ $dygraphs-legend-offset: 32px;
&__spinner { &__spinner {
width: 121px; width: 121px;
height: 121px; height: 121px;
background-image: url(/assets/images/laser-spinner.png); background-image: url(assets/images/laser-spinner.png);
background-size: 100% 100%; background-size: 100% 100%;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -139,7 +139,7 @@ $dygraphs-legend-offset: 32px;
&__spinner--small { &__spinner--small {
width: 38px; width: 38px;
height: 38px; height: 38px;
background-image: url(/assets/images/laser-spinner.png); background-image: url(assets/images/laser-spinner.png);
background-size: 100% 100%; background-size: 100% 100%;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -263,4 +263,4 @@ $dygraphs-legend-offset: 32px;
font-weight: 600; font-weight: 600;
} }
} }
} }

7
ui/webpack/devConfig.js
View File

@ -36,16 +36,15 @@ module.exports = {
}, },
{ {
test: /\.scss$/, test: /\.scss$/,
//loader: 'style!css!sass', loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader!resolve-url!sass?sourceMap'),
loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader'),
}, },
{ {
test: /\.css$/, test: /\.css$/,
loader: ExtractTextPlugin.extract('style-loader', 'css-loader!postcss-loader'), loader: ExtractTextPlugin.extract('style-loader', 'css-loader!postcss-loader'),
}, },
{ {
test : /\.(ttf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/, test : /\.(png|jpg|ttf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
loader : 'file-loader', loader : 'file',
}, },
{ {
test: /\.js$/, test: /\.js$/,