From 4288f536f196136ed529803509c685a75bb39037 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 21 Mar 2018 18:31:53 +0100 Subject: [PATCH] Use requireCSS to load FontAwesome --- customize.dist/template.js | 2 +- www/contacts/inner.js | 2 +- www/debug/inner.js | 2 +- www/drive/inner.js | 2 +- www/file/inner.js | 2 +- www/filepicker/inner.js | 2 +- www/login/main.js | 2 +- www/pad/inner.js | 2 +- www/poll/inner.js | 2 +- www/profile/inner.js | 2 +- www/register/main.js | 2 +- www/settings/inner.js | 2 +- www/slide/inner.js | 2 +- www/todo/inner.js | 2 +- www/whiteboard/inner.js | 2 +- www/worker/inner.js | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/customize.dist/template.js b/customize.dist/template.js index ddfd1c1d8..5a702a25d 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -3,7 +3,7 @@ define([ '/common/hyperscript.js', '/customize/pages.js', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', ], function ($, h, Pages) { $(function () { var $body = $('body'); diff --git a/www/contacts/inner.js b/www/contacts/inner.js index 1d3ab9fa9..7f9983c5d 100644 --- a/www/contacts/inner.js +++ b/www/contacts/inner.js @@ -11,7 +11,7 @@ define([ '/common/common-interface.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/debug/inner.js b/www/debug/inner.js index bb4e1ecf2..9968ab13b 100644 --- a/www/debug/inner.js +++ b/www/debug/inner.js @@ -15,7 +15,7 @@ define([ '/bower_components/secure-fabric.js/dist/fabric.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/drive/inner.js b/www/drive/inner.js index 9576bd9d4..5b733b86d 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -18,7 +18,7 @@ define([ '/customize/messages.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/file/inner.js b/www/file/inner.js index b90f392a1..8ad9532ad 100644 --- a/www/file/inner.js +++ b/www/file/inner.js @@ -16,7 +16,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( diff --git a/www/filepicker/inner.js b/www/filepicker/inner.js index 91bca36c8..fa844ab27 100644 --- a/www/filepicker/inner.js +++ b/www/filepicker/inner.js @@ -11,7 +11,7 @@ define([ '/customize/messages.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/login/main.js b/www/login/main.js index b3f08a0cf..b69a94323 100644 --- a/www/login/main.js +++ b/www/login/main.js @@ -8,7 +8,7 @@ define([ '/common/outer/local-store.js', '/common/test.js', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', ], function ($, Cryptpad, Login, UI, Realtime, Feedback, LocalStore, Test) { $(function () { var $main = $('#mainBlock'); diff --git a/www/pad/inner.js b/www/pad/inner.js index 250a39765..d77770ce9 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -36,7 +36,7 @@ define([ '/bower_components/diff-dom/diffDOM.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/poll/inner.js b/www/poll/inner.js index 1a0c14f8c..fabcad7e4 100644 --- a/www/poll/inner.js +++ b/www/poll/inner.js @@ -26,7 +26,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/profile/inner.js b/www/profile/inner.js index f68949dfd..40642507a 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -19,7 +19,7 @@ define([ 'css!/bower_components/codemirror/addon/dialog/dialog.css', 'css!/bower_components/codemirror/addon/fold/foldgutter.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', '/bower_components/croppie/croppie.min.js', 'css!/bower_components/croppie/croppie.css', diff --git a/www/register/main.js b/www/register/main.js index 0c56dcff2..dea51dad1 100644 --- a/www/register/main.js +++ b/www/register/main.js @@ -11,7 +11,7 @@ define([ '/common/common-feedback.js', '/common/outer/local-store.js', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', ], function ($, Login, Cryptpad, Test, Cred, UI, Util, Realtime, Constants, Feedback, LocalStore) { var Messages = Cryptpad.Messages; diff --git a/www/settings/inner.js b/www/settings/inner.js index c9e1cf72c..3ecd49ce8 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -14,7 +14,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/slide/inner.js b/www/slide/inner.js index b25e94685..88e534b44 100644 --- a/www/slide/inner.js +++ b/www/slide/inner.js @@ -14,7 +14,7 @@ define([ 'cm/lib/codemirror', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', 'css!cm/lib/codemirror.css', diff --git a/www/todo/inner.js b/www/todo/inner.js index 136a908e9..07a8b3f42 100644 --- a/www/todo/inner.js +++ b/www/todo/inner.js @@ -12,7 +12,7 @@ define([ '/bower_components/sortablejs/Sortable.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js index 489637e10..9082836b1 100644 --- a/www/whiteboard/inner.js +++ b/www/whiteboard/inner.js @@ -20,7 +20,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $, diff --git a/www/worker/inner.js b/www/worker/inner.js index 3f7df3f16..667f09221 100644 --- a/www/worker/inner.js +++ b/www/worker/inner.js @@ -8,7 +8,7 @@ define([ '/customize/messages.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/main.less', ], function ( $,