Skip to content
This repository has been archived by the owner on Mar 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #675 from OpenBazaar/cleanUpEmojis
Browse files Browse the repository at this point in the history
Clean up emojis
  • Loading branch information
rmisio authored Aug 17, 2017
2 parents e8fd9ae + 9220b08 commit 15c6862
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions js/templates/modals/moderatorDetails.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<div class="contentBox mDetailBox padMd clrP clrBr clrSh3 tx5">
<div class="flex gutterH row">
<div>
<a class="userIcon disc clrBr2 clrSh1" style="<%= ob.getAvatarBgImage(ob.avatarHashes) %>"></a>
<a class="userIcon disc clrBr2 clrSh1"
style="<%= ob.getAvatarBgImage(ob.avatarHashes) %>"
href="#<%= ob.peerID %>"></a>
</div>
<div>
<div class="flex snipKids gutterHSm rowSm">
Expand All @@ -31,14 +33,14 @@
<div class="contentBox mDetailBox flexRow flexVCent gutterH padMd clrP clrBr clrSh3">
<div class="flexExpand">
<div class="flexCol flexCent">
<div>📍 <%= ob.location || ob.polyT('userPage.noLocation') %></div>
<div><%= ob.parseEmojis('📍') %> <%= ob.location || ob.polyT('userPage.noLocation') %></div>
<div class="tx5b clrT2"><%= ob.polyT('moderatorDetails.location') %></div>
</div>
</div>
<div class="rowDivV clrBr"></div>
<div class="flexExpand">
<div class="rowDivV clrBr TODO"></div>
<div class="flexExpand TODO">
<div class="flexCol flexCent">
👍 XX<% // placeholder for reputation %>
<%= ob.parseEmojis('👍') %> XX<% // placeholder for reputation %>
<div class="tx5b clrT2"><%= ob.polyT('moderatorDetails.recommendations') %></div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/templates/userCard.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</div>
<div class="flex gutterH contentBottom">
<div class="flexExpand">
<span class="clrT2 clamp tx5b">📍 <%= ob.location || ob.polyT('userPage.noLocation') %></span>
<span class="clrT2 clamp tx5b"><%= ob.parseEmojis('📍') %> <%= ob.location || ob.polyT('userPage.noLocation') %></span>
</div>
<div class="tx6">
<% print(`${ob.formatRating(ob.stats.averageRating, ob.stats.ratingCount)}`) %>
Expand Down

0 comments on commit 15c6862

Please sign in to comment.