feat: more merge fixes

main
Barış Soner Uşaklı 5 years ago
parent 9a0cdd0eb2
commit c4e3d07940

@ -8,12 +8,17 @@
</p> </p>
<p> <p>
<div class="input-group"> <div class="input-group">
<input class="form-control" type="text"> <input class="form-control topic-search-input" type="text">
<span class="input-group-addon"> <span class="input-group-addon">
<i class="fa fa-search"></i> <i class="fa fa-search"></i>
</span> </span>
</div> </div>
</p> </p>
<div style="position: relative;">
<div class="quick-search-container hidden">
<div id="quick-search-results-container"></div>
</div>
</div>
<p><strong>[[topic:merge-topic-list-title]]</strong></p> <p><strong>[[topic:merge-topic-list-title]]</strong></p>
<ul class="topics-section"> <ul class="topics-section">
{{{each topics}}} {{{each topics}}}

@ -1,6 +1,6 @@
<ul id="quick-search-results" class="quick-search-results"> <ul id="quick-search-results" class="quick-search-results">
{{{each posts}}} {{{each posts}}}
<li> <li data-tid="{posts.topic.tid}" data-pid="{posts.pid}">
<a href="{config.relative_path}/post/{posts.pid}"> <a href="{config.relative_path}/post/{posts.pid}">
{buildAvatar(posts.user, "sm", true)} {buildAvatar(posts.user, "sm", true)}
<span class="quick-search-title">{posts.topic.title}</span> <span class="quick-search-title">{posts.topic.title}</span>

Loading…
Cancel
Save