Skip to content

Commit

Permalink
Use postcss-loader in favour of sass-loader
Browse files Browse the repository at this point in the history
  • Loading branch information
cookpete committed Jan 17, 2018
1 parent 363a3b2 commit d691af4
Show file tree
Hide file tree
Showing 8 changed files with 241 additions and 259 deletions.
15 changes: 13 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,15 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.2",
"mocha": "^4.0.0",
"node-sass": "^4.1.1",
"postcss-automath": "^1.0.1",
"postcss-loader": "^2.0.10",
"postcss-nested": "^3.0.0",
"postcss-sassy-mixins": "^2.1.0",
"postcss-simple-vars": "^4.1.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-hot-loader": "^4.0.0-beta.15",
"rimraf": "^2.5.4",
"sass-loader": "^6.0.1",
"screenfull": "^3.0.2",
"snazzy": "^7.0.0",
"standard": "^10.0.0",
Expand Down Expand Up @@ -117,6 +120,14 @@
}
}
},
"postcss": {
"plugins": {
"postcss-nested": {},
"postcss-sassy-mixins": {},
"postcss-simple-vars": {},
"postcss-automath": {}
}
},
"standard": {
"parser": "babel-eslint",
"ignore": [
Expand Down
10 changes: 2 additions & 8 deletions src/demo/App.scss → src/demo/App.css
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
$black: #000;
$column-width: 480px;
$gutter-width: 20px;
// $break: $column-width * 2 + $gutter-width * 3;

.app {
margin: auto;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-weight: 300;
text-align: center;

@media screen and ($column-width * 2) {

}
}

.section {
Expand All @@ -29,11 +23,11 @@ $gutter-width: 20px;

.react-player {
margin-bottom: 10px;
background: rgba($black, .1);
background: rgba(0, 0, 0, .1);
}

.faded {
color: rgba($black, .5);
color: rgba(0, 0, 0, .5);
}

.footer {
Expand Down
8 changes: 4 additions & 4 deletions src/demo/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { findDOMNode } from 'react-dom'
import { hot } from 'react-hot-loader'
import screenfull from 'screenfull'

import './reset.scss'
import './defaults.scss'
import './App.scss'
import './Range.scss'
import './reset.css'
import './defaults.css'
import './range.css'
import './App.css'

import { version } from '../../package.json'
import ReactPlayer from '../ReactPlayer'
Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions src/demo/Range.scss → src/demo/range.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
// Styling Cross-Browser Compatible Range Inputs with Sass
// Github: https://github.com/darlanrod/input-range-sass
// Author: Darlan Rod https://github.com/darlanrod
// Version 1.0.1
// MIT License
*/

$track-color: #ccc;
$thumb-color: #666;
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions webpack.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ export default {
include: [ PATH_SRC, PATH_TESTS ]
},
{
test: /\.scss$/,
test: /\.css$/,
use: styleLoader([
'style-loader',
'css-loader?sourceMap',
'sass-loader?sourceMap'
'postcss-loader?sourceMap'
]),
include: PATH_SRC
}
Expand Down
Loading

0 comments on commit d691af4

Please sign in to comment.