library-mirrors/dat.gui
1
0
Fork 0
mirror of https://github.com/dataarts/dat.gui.git synced 2024-12-12 04:08:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tidy up how optional CSS file is built

Browse Source
This commit is contained in:
Jeff Nusz 2016-09-01 12:50:55 -07:00
parent dbd80251f3
commit 986494ac80
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -8,8 +8,10 @@
}, },
"scripts": { "scripts": {
"test": "node ./node_modules/eslint/bin/eslint.js src/", "test": "node ./node_modules/eslint/bin/eslint.js src/",
"build": "webpack --config ./webpack/webpack.config.js --devtool sourcemap && webpack --config ./webpack/webpack.config.min.js", "dev": "webpack --progress --colors --watch --config webpack/webpack.config.js --devtool sourcemap",
"dev": "webpack --progress --colors --watch --config webpack/webpack.config.js --devtool sourcemap" "build": "npm run build-js && npm run build-css",
"build-js": "webpack --config ./webpack/webpack.config.js --devtool sourcemap && webpack --config ./webpack/webpack.config.min.js",
"build-css": "node-sass src/dat/gui/style.scss build/dat.gui.css"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

5
src/dat/gui/GUI.js
View File

@ -25,10 +25,9 @@ import CenteredDiv from '../dom/CenteredDiv';
import dom from '../dom/dom'; import dom from '../dom/dom';
import common from '../utils/common'; import common from '../utils/common';
import styleSheet from '!css!sass!./style.scss'; // CSS to embed in build import styleSheet from './style.scss'; // CSS to embed in build
import styleSheetExternal from '!file?name=dat.gui.css!extract!css!sass!./style.scss'; // CSS as external file
css.inject(styleSheet, styleSheetExternal); css.inject(styleSheet);
/** Outer-most className for GUI's */ /** Outer-most className for GUI's */
const CSS_NAMESPACE = 'dg'; const CSS_NAMESPACE = 'dg';

2
src/dat/utils/css.js
View File

@ -21,7 +21,7 @@ module.exports = {
doc.getElementsByTagName('head')[0].appendChild(link); doc.getElementsByTagName('head')[0].appendChild(link);
}, },
inject: function(css, externalCssFileName, indoc) { inject: function(css, indoc) {
const doc = indoc || document; const doc = indoc || document;
const injected = document.createElement('style'); const injected = document.createElement('style');
injected.type = 'text/css'; injected.type = 'text/css';

5
webpack/webpack.config.js
View File

@ -19,7 +19,8 @@ module.exports = {
context: path.resolve(__dirname, '..', 'src'), context: path.resolve(__dirname, '..', 'src'),
entry: { entry: {
main: '../index' main: '../index',
}, },
module: { module: {
@ -48,7 +49,7 @@ module.exports = {
}, },
{ {
test: /\.scss$/, test: /\.scss$/,
loader: 'style!css!sass' loader: 'css-loader!sass-loader'
} }
] ]
}, },