Merge branch 'master' of github.com:madmaniak/pro-framework

.gitignore

@@ -4,6 +4,7 @@ node_modules/*
 *.log*
 services/init.coffee
 public/*
+!public/.gitignore
 .byebug_history
 .vagrant
 _site

tools/bundler/webpack/webpack.prod.config.js

@@ -44,7 +44,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.s(c|a)ss$/,
+        test: /\.(s?c|sa)ss$/,
         use: [
 			{ loader: 'style-loader' },
 			{ loader: 'css-loader' },

tools/starter/frontend_init.rb

@@ -17,7 +17,7 @@ libs += ["global.Views = [#{views}]"]
 list = ["framework/services/index.coffee"]
 list += ['framework/app/app.imba'] unless File.exist? 'app/app.imba'
 list +=
-  PathsResolver.resolve('s(c|a)ss', sort: true) +
+  PathsResolver.resolve('(s?c|sa)ss', sort: true) +
   PathsResolver.resolve('(jpe?g|png|gif|svg)') +
   PathsResolver.resolve('(imba|js|coffee)', sort: :leafs_first)