SCSS Bootstrap compiler

dsamarin · dsamarin · commit b7aced93f31e · 2018-05-20T22:43:53.000-07:00
diff --git a/INSTALL.md b/INSTALL.md
@@ -12,6 +12,7 @@ go get github.com/oftn-oswg/zerodrop
 cd $GOPATH/src/oftn-oswg/zerodrop
 
 yarn install # or npm install
+yarn run css # or npm run css
 yarn run dist # or npm run dist
 
 # EDIT config.yml to your liking.
diff --git a/package.json b/package.json
@@ -9,15 +9,10 @@
   "private": true,
   "devDependencies": {
     "@types/jquery": "^3.3.2",
-    "autoprefixer": "^8.5.0",
     "bootstrap": "^4.1.1",
-    "css-loader": "^0.28.11",
     "jquery": "^3.3.1",
     "node-sass": "^4.9.0",
     "popper.js": "^1.14.3",
-    "postcss-loader": "^2.1.5",
-    "sass-loader": "^7.0.1",
-    "style-loader": "^0.21.0",
     "ts-loader": "^4.3.0",
     "typescript": "^2.8.3",
     "uglifyjs-webpack-plugin": "^1.2.5",
@@ -26,6 +21,7 @@
   },
   "scripts": {
     "build": "webpack --mode development",
-    "dist": "webpack --mode production"
+    "dist": "webpack --mode production",
+    "css": "node-sass --output-style compressed ./scss/zerodrop.scss ./static/zerodrop.css"
   }
 }
diff --git a/scss/zerodrop.scss b/scss/zerodrop.scss
@@ -0,0 +1 @@
+@import "node_modules/bootstrap/scss/bootstrap";
diff --git a/static/.gitignore b/static/.gitignore
@@ -1,3 +1,4 @@
 # These files are generated with webpack
 /zerodrop.js
 /zerodrop.js.map
+/zerodrop.css
diff --git a/templates/header.tmpl b/templates/header.tmpl
@@ -6,8 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>{{$.Title}}</title>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4"
-        crossorigin="anonymous" />
+    <link rel="stylesheet" href="{{$.Config.Base}}admin/static/zerodrop.css" type="text/css" />
 </head>
 
 <body>
diff --git a/ts/zerodrop.ts b/ts/zerodrop.ts
diff --git a/webpack.config.js b/webpack.config.js
@@ -3,7 +3,7 @@ const webpack = require('webpack');
 const uglify = require('uglifyjs-webpack-plugin');
 
 module.exports = {
-    entry: path.join(__dirname, 'typescript/Zerodrop.ts'),
+    entry: path.join(__dirname, 'ts/zerodrop.ts'),
     output: {
         filename: 'zerodrop.js',
         path: path.join(__dirname, 'static')
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@import "node_modules/bootstrap/scss/bootstrap";`