Peter Justin 4 лет назад
Родитель
Сommit
0003a00844

+ 12 - 11
flaskbb/themes/aurora/package.json

@@ -32,20 +32,21 @@
     "watch:all": "npm-run-all -p watch:css watch:js"
   },
   "devDependencies": {
-    "autoprefixer": "^8.2.0",
-    "imagemin-cli": "^3.0.0",
-    "node-sass": "^4.8.3",
-    "npm-run-all": "^4.1.2",
-    "onchange": "^3.3.0",
-    "postcss-cli": "^5.0.0",
-    "uglify-js": "^3.3.16"
+    "autoprefixer": "^10.0.4",
+    "imagemin-cli": "^6.0.0",
+    "sass": "^1.29.0",
+    "npm-run-all": "^4.1.5",
+    "onchange": "^7.1.0",
+    "postcss": "^8.1.10",
+    "postcss-cli": "^8.3.0",
+    "uglify-js": "^3.12.1"
   },
   "dependencies": {
     "bootstrap-markdown": "^2.10.0",
-    "bootstrap-sass": "^3.3.7",
+    "bootstrap-sass": "^3.4.1",
     "font-awesome": "^4.7.0",
-    "jquery": "^3.3.1",
-    "jquery-textcomplete": "^1.8.4",
-    "marked": "^0.3.19"
+    "jquery": "^3.5.1",
+    "jquery-textcomplete": "^1.8.5",
+    "marked": "^1.2.5"
   }
 }

+ 1 - 1
flaskbb/themes/aurora/src/scss/_mixins.scss

@@ -1 +1 @@
-@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/_panels.scss";
+@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/_panels.scss";

+ 3 - 3
flaskbb/themes/aurora/src/scss/styles.scss

@@ -2,13 +2,13 @@
 @import "bootstrap-variables";
 
 // Import Bootstrap for Sass
-@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
+@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
 
 // Import fontawesome icons
-@import "node_modules/font-awesome/scss/font-awesome";
+@import "../../node_modules/font-awesome/scss/font-awesome";
 
 // Import FlaskBB theme
 @import "aurora";
 
 // Import the Bootstrap-Markdown editor
-@import "node_modules/bootstrap-markdown/css/bootstrap-markdown.min";
+@import "../../node_modules/bootstrap-markdown/css/bootstrap-markdown.min";

+ 4 - 6
flaskbb/themes/aurora/tools/build_css

@@ -1,6 +1,4 @@
-node-sass \
-    src/scss/styles.scss \
-    --include-path 'src/scss node_modules/bootstrap-sass/assets/stylesheets/bootstrap node_modules/font-awesome/scss/font-awesome' \
-    --precision 8 \
-    --output-style compressed \
-    --output static/css/
+sass \
+    src/scss/styles.scss:static/css/styles.css \
+    --load-path='node_modules/bootstrap-sass/assets/stylesheets/bootstrap node_modules/font-awesome/scss/font-awesome' \
+    --style='compressed'