From eadeb42e578344bfe3c7591a88c567f62e1272f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 22 Aug 2022 19:01:17 -0400 Subject: [PATCH] fix: move fontawesome before theme --- public/src/client/header.js | 2 +- src/meta/css.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/src/client/header.js b/public/src/client/header.js index 31de3bc475..1f108a64d4 100644 --- a/public/src/client/header.js +++ b/public/src/client/header.js @@ -43,7 +43,7 @@ define('forum/header', [ if (env === 'xs' || env === 'sm' || utils.isTouchDevice()) { return; } - $('#header-menu li a[title]').each(function () { + $('#header-menu li[title]').each(function () { $(this).tooltip({ placement: 'bottom', trigger: 'hover', diff --git a/src/meta/css.js b/src/meta/css.js index b9504d66e5..88b9e6c515 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -28,9 +28,10 @@ const buildImports = { '@import "bootstrap/scss/bootstrap";', '@import "../../public/scss/mixins.scss";', '@import "../../public/scss/generics.scss";', + '@import "fontawesome";', '@import "./theme";', source, - '@import "fontawesome";', + '@import "../../public/scss/jquery-ui.scss";', '@import "../node_modules/@adactive/bootstrap-tagsinput/src/bootstrap-tagsinput";', '@import "../node_modules/cropperjs/dist/cropper";', @@ -46,9 +47,9 @@ const buildImports = { '@import "bootstrap/scss/bootstrap";', '@import "../../public/scss/mixins.scss";', '@import "../public/scss/generics.scss";', + '@import "fontawesome";', '@import "../public/scss/admin/admin.scss";', source, - '@import "fontawesome";', '@import "../../public/scss/jquery-ui.scss";', '@import "../node_modules/@adactive/bootstrap-tagsinput/src/bootstrap-tagsinput";', '@import "../public/vendor/mdl/material";',