Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-12 23:50:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: fa icon picker, help-block => form-text

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-09-11 00:05:42 -04:00
parent bdd02b72de
commit ff7c57f7bf
15 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/scss/admin/admin.scss
View File

@@ -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;

10
public/scss/admin/manage/groups.scss
View File

@@ -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;
}

2
public/src/admin/manage/categories.js
View File

@@ -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: '<input type="number" min="1" class="form-control input-lg" value=' + order + ' /><p class="help-block">[[admin/manage/categories:set-order-help]]</p>',
message: '<input type="number" min="1" class="form-control input-lg" value=' + order + ' /><p class="form-text">[[admin/manage/categories:set-order-help]]</p>',
show: true,
buttons: {
save: {

2
public/src/client/chats.js
View File

@@ -294,7 +294,7 @@ define('forum/chats', [
bootbox.confirm({
size: 'small',
title: '[[modules:chat.leave]]',
message: '<p>[[modules:chat.leave-prompt]]</p><p class="help-block">[[modules:chat.leave-help]]</p>',
message: '<p>[[modules:chat.leave-prompt]]</p><p class="form-text">[[modules:chat.leave-help]]</p>',
callback: function (ok) {
if (ok) {
api.delete(`/chats/${roomId}/users/${app.user.uid}`, {}).then(() => {

6
public/src/modules/iconSelect.js
View File

@@ -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($('<i class="fa fa-nbb-none"></i>'));
html.find('.nbb-fa-icons').prepend($('<i class="fa fa-nbb-none"></i>'));
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) {

3
src/views/admin/manage/group.tpl
View File

@@ -158,8 +158,7 @@
<div id="icons" style="display:none;">
<div class="icon-container">
<div class="row fa-icons">
<i class="fa fa-doesnt-exist"></i>
<div class="row nbb-fa-icons">
<!-- IMPORT partials/fontawesome.tpl -->
</div>
</div>

2
src/views/admin/partials/privileges/category.tpl
View File

@@ -77,7 +77,7 @@
</tr>
</tfoot>
</table>
<div class="help-block">
<div class="form-text">
[[admin/manage/categories:privileges.inherit]]
</div>
<hr/>

2
src/views/admin/partials/privileges/global.tpl
View File

@@ -56,7 +56,7 @@
</tr>
</tfoot>
</table>
<div class="help-block">
<div class="form-text">
[[admin/manage/categories:privileges.inherit]]
</div>
<hr/>

2
src/views/admin/partials/temporary-ban.tpl
View File

@@ -24,7 +24,7 @@
</div>
</div>
<div class="col-sm-8">
<p class="help-block">
<p class="form-text">
[[admin/manage/users:temp-ban.explanation]]
</p>
</div>

2
src/views/admin/settings/tags.tpl
View File

@@ -13,7 +13,7 @@
<div class="mb-3">
<label class="form-label" for="systemTags">[[admin/settings/tags:system-tags]]</label>
<input id="systemTags" type="text" class="form-control" value="" data-field="systemTags" data-field-type="tagsinput" />
<p class="help-block">
<p class="form-text">
[[admin/settings/tags:system-tags-help]]
</p>
</div>

4
src/views/modals/move-post.tpl
View File

@@ -4,13 +4,13 @@
</h5>
<div class="card-body">
<div>
<label for="topicId">[[topic:topic-id]]</label>
<label class="form-label" for="topicId">[[topic:topic-id]]</label>
<input id="topicId" type="text" class="form-control"><br/>
</div>
<p>
<strong><span id="pids"></span></strong>
</p>
<p class="help-block">
<p class="form-text">
[[topic:move_posts_instruction]]
</p>
</div>

4
src/views/modals/set-pin-expiry.tpl
View File

@@ -1,5 +1,5 @@
<div class="form-group">
<label for="expiry">[[topic:pin-modal-expiry]]</label>
<label class="form-label" for="expiry">[[topic:pin-modal-expiry]]</label>
<input id="expiry" type="date" class="form-control" />
<p class="help-block">[[topic:pin-modal-help]]</p>
<p class="form-text">[[topic:pin-modal-help]]</p>
</div>

2
src/views/modals/topic-thumbs.tpl
View File

@@ -16,5 +16,5 @@
</div>
{{{ end }}}
<hr />
<p class="help-block">[[modules:thumbs.modal.resize-note, {config.thumbs.size}]]</p>
<p class="form-text">[[modules:thumbs.modal.resize-note, {config.thumbs.size}]]</p>
</div>

14
src/views/partials/email_update.tpl
View File

@@ -1,21 +1,21 @@
<div class="form-group">
<div class="mb-3">
<p>[[user:emailUpdate.intro]]</p>
{{{ if requireEmailAddress }}}
<p>[[user:emailUpdate.required]]</p>
{{{ else }}}
<p>[[user:emailUpdate.optional]]</p>
{{{ end }}}
<div class="form-group">
<label for="email">[[global:email]]</label>
<div class="mb-3">
<label class="form-label" for="email">[[global:email]]</label>
<input class="form-control" type="text" id="email" name="email" placeholder="{email}" value="{email}" />
<p class="help-block">[[user:emailUpdate.change-instructions]]</p>
<p class="form-text">[[user:emailUpdate.change-instructions]]</p>
</div>
{{{ if issuePasswordChallenge }}}
<div class="form-group">
<label for="password">[[register:password]]</label>
<div class="mb-3">
<label class="form-label" for="password">[[register:password]]</label>
<input class="form-control" type="password" id="password" name="password" />
<p class="help-block">[[user:emailUpdate.password-challenge]]</p>
<p class="form-text">[[user:emailUpdate.password-challenge]]</p>
</div>
{{{ end }}}
</div>

6
src/views/partials/fontawesome.tpl
View File

@@ -1,9 +1,9 @@
<div class="icon-container">
<div class="form-group">
<label for="fa-filter">Type to filter icons</label>
<label class="form-label" for="fa-filter">Type to filter icons</label>
<input type="text" class="form-control" id="fa-filter" data-action="filter" placeholder="e.g. umbrella" />
</div>
<div class="row fa-icons">
<div class="d-flex nbb-fa-icons flex-wrap">
<i class="fa fa-500px"></i>
<i class="fa fa-address-book"></i>
<i class="fa fa-address-book-o"></i>
@@ -792,7 +792,7 @@
<i class="fa fa-youtube-square"></i>
</div>
<p class="help-block text-center">
<p class="form-text text-center">
For a full list of icons, please consult:
<a href="https://fontawesome.com/v5.15/icons/">FontAwesome</a>
</p>