Merge branch 'dev' of ../unfediverse.com into dev

This commit is contained in:
Mike Macgirvin 2023-01-30 12:34:40 -08:00
commit fea06f77a8
3 changed files with 3 additions and 3 deletions

View file

@ -79,7 +79,7 @@
</div>
{{if $reset}}
<div class="btn-group float-end" id="comment-edit-reset-wrapper-{{$id}}">
<button id="comment-reset-{{$id}}" class="btn btn-outline-secondary btn-sm comment-reset" title="{{$reset}}" onclick="commentCancel({{$id}}); return false;"><i class="fa fa-close fa-fw"></i></button>
<button id="comment-reset-{{$id}}" class="btn btn-outline-secondary btn-sm comment-reset" title="{{$reset}}" onclick="commentCancel({{$id}}); return false;"><i class="fa fa-close fa-fw drop-icons"></i></button>
</div>
{{/if}}
</div>

View file

@ -234,7 +234,7 @@
<div class="btn-toolbar float-start" style="margin-left:3rem;">
<div class="btn-group ">
<button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm" title="{{$reset}}" onclick="itemCancel(); return false;">
<i class="fa fa-close"></i>
<i class="fa fa-close drop-icons"></i>
</button>
</div>
</div>

View file

@ -4,7 +4,7 @@
<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
</a>
</div>
<!--a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-times drop-icons btn btn-outline-secondary"></i></a-->
<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-close drop-icons btn btn-outline-secondary"></i></a>
<div class="profile-match-break"></div>
<div class="profile-match-name">
<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>