Merge branch 'less-less' into staging

2018-07-18 14:18:37 +02:00
parent aafcb1bc02 8d95efa144
commit ebfa2c2dc3
76 changed files with 3627 additions and 3427 deletions
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -16,7 +16,7 @@ define([
    '/bower_components/file-saver/FileSaver.min.js',
    'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
-    'less!/customize/src/less2/main.less',
+    'less!/settings/app-settings.less',
 ], function (
    $,
    Toolbar,