From ff7c57f7bf25491d1fe446988d6e68db31aa1f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 11 Sep 2022 00:05:42 -0400 Subject: [PATCH] fix: fa icon picker, help-block => form-text --- public/scss/admin/admin.scss | 15 +++++++++------ public/scss/admin/manage/groups.scss | 10 ---------- public/src/admin/manage/categories.js | 2 +- public/src/client/chats.js | 2 +- public/src/modules/iconSelect.js | 6 +++--- src/views/admin/manage/group.tpl | 3 +-- src/views/admin/partials/privileges/category.tpl | 2 +- src/views/admin/partials/privileges/global.tpl | 2 +- src/views/admin/partials/temporary-ban.tpl | 2 +- src/views/admin/settings/tags.tpl | 2 +- src/views/modals/move-post.tpl | 4 ++-- src/views/modals/set-pin-expiry.tpl | 4 ++-- src/views/modals/topic-thumbs.tpl | 2 +- src/views/partials/email_update.tpl | 14 +++++++------- src/views/partials/fontawesome.tpl | 6 +++--- 15 files changed, 34 insertions(+), 42 deletions(-) diff --git a/public/scss/admin/admin.scss b/public/scss/admin/admin.scss index e11c750f8f..12290457c2 100644 --- a/public/scss/admin/admin.scss +++ b/public/scss/admin/admin.scss @@ -126,16 +126,19 @@ body { } .icon-container { - .row { + .fa-nbb-none { + border: 1px dotted black; + } + .nbb-fa-icons { margin: 0; i { - width:20px; - height:20px; - margin: 1px; + width: 24px; + height: 24px; cursor: pointer; - line-height: 20px; + line-height: 24px; text-align: center; - color: $gray-300; + color: $gray-800; + margin: 3px; &:hover, &.selected { background: $primary; diff --git a/public/scss/admin/manage/groups.scss b/public/scss/admin/manage/groups.scss index 337301673a..8cad8083b2 100644 --- a/public/scss/admin/manage/groups.scss +++ b/public/scss/admin/manage/groups.scss @@ -36,16 +36,6 @@ cursor: pointer; } - .fa-nbb-none { - border: 1px dotted black; - height: 35px; - width: 35px; - } - - .fa-icons .fa-nbb-none { - vertical-align: -6px; - } - #group-icon-preview.fa-nbb-none { display: none; } diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index cae9f782ca..83f88898c0 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -51,7 +51,7 @@ define('admin/manage/categories', [ const order = $(this).attr('data-order'); const modal = bootbox.dialog({ title: '[[admin/manage/categories:set-order]]', - message: '

[[admin/manage/categories:set-order-help]]

', + message: '

[[admin/manage/categories:set-order-help]]

', show: true, buttons: { save: { diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 1c27176959..5cb2d57d52 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -294,7 +294,7 @@ define('forum/chats', [ bootbox.confirm({ size: 'small', title: '[[modules:chat.leave]]', - message: '

[[modules:chat.leave-prompt]]

[[modules:chat.leave-help]]

', + message: '

[[modules:chat.leave-prompt]]

[[modules:chat.leave-help]]

', callback: function (ok) { if (ok) { api.delete(`/chats/${roomId}/users/${app.user.uid}`, {}).then(() => { diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.js index 7bbbfb7fa9..96419f2614 100644 --- a/public/src/modules/iconSelect.js +++ b/public/src/modules/iconSelect.js @@ -13,7 +13,7 @@ define('iconSelect', ['benchpress', 'bootbox'], function (Benchpress, bootbox) { if (selected) { try { - $('#icons .fa-icons .fa.' + selected).addClass('selected'); + $('#icons .nbb-fa-icons .fa.' + selected).addClass('selected'); } catch (err) { selected = ''; } @@ -21,7 +21,7 @@ define('iconSelect', ['benchpress', 'bootbox'], function (Benchpress, bootbox) { Benchpress.render('partials/fontawesome', {}).then(function (html) { html = $(html); - html.find('.fa-icons').prepend($('')); + html.find('.nbb-fa-icons').prepend($('')); const picker = bootbox.dialog({ onEscape: true, @@ -79,7 +79,7 @@ define('iconSelect', ['benchpress', 'bootbox'], function (Benchpress, bootbox) { picker.on('shown.bs.modal', function () { const modalEl = $(this); const searchEl = modalEl.find('input'); - const icons = modalEl.find('.fa-icons i'); + const icons = modalEl.find('.nbb-fa-icons i'); const submitEl = modalEl.find('button.btn-primary'); function changeSelection(newSelection) { diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl index 395f302bdb..471c4ce2c3 100644 --- a/src/views/admin/manage/group.tpl +++ b/src/views/admin/manage/group.tpl @@ -158,8 +158,7 @@ \ No newline at end of file diff --git a/src/views/partials/email_update.tpl b/src/views/partials/email_update.tpl index 5e2d77f183..4bc32819e8 100644 --- a/src/views/partials/email_update.tpl +++ b/src/views/partials/email_update.tpl @@ -1,21 +1,21 @@ -
+

[[user:emailUpdate.intro]]

{{{ if requireEmailAddress }}}

[[user:emailUpdate.required]]

{{{ else }}}

[[user:emailUpdate.optional]]

{{{ end }}} -
- +
+ -

[[user:emailUpdate.change-instructions]]

+

[[user:emailUpdate.change-instructions]]

{{{ if issuePasswordChallenge }}} -
- +
+ -

[[user:emailUpdate.password-challenge]]

+

[[user:emailUpdate.password-challenge]]

{{{ end }}}
\ No newline at end of file diff --git a/src/views/partials/fontawesome.tpl b/src/views/partials/fontawesome.tpl index fd3afd7c4f..046c490966 100644 --- a/src/views/partials/fontawesome.tpl +++ b/src/views/partials/fontawesome.tpl @@ -1,9 +1,9 @@
- +
-
+
@@ -792,7 +792,7 @@
-

+

For a full list of icons, please consult: FontAwesome