Skip to content

Commit

Permalink
moves flag to the right so u dont accidently click it
Browse files Browse the repository at this point in the history
  • Loading branch information
owocki committed Feb 6, 2020
1 parent 3006af9 commit 29ea3d1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/avatar/views_3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def get_avatar_attrs(theme, key):
'accessories': '100 50 100 100',
},
'skin_tones': [
'FFCAA6', 'FFFFF6', 'FEF7EB', 'F8D5C2', 'EEE3C1', 'D8BF82', 'D2946B', 'AE7242', '88563B', '715031', '593D26',
'392D16'
'FFCAA6', 'FFFFF6', 'FEF7EB', 'F8D5C2', 'EEE3C1', 'D8BF82', 'D2946B', 'AE7242', '88563B', '715031',
'593D26', '392D16'
],
'hair_tones': [
'000000', '4E3521', '8C3B28', 'B28E28', 'F4EA6E', 'F0E6FF', '4D22D2', '8E2ABE', '3596EC', '0ECF7C'
Expand Down
4 changes: 1 addition & 3 deletions app/retail/templates/shared/activity.html
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@

<a href=# data-pk={{row.pk}} class="comment_activity" data-toggle="tooltip" title="Comment on this feed item." {% if row.comments %} data-open="true" {% endif %} ><span class="action"><i class="far fa-comments"></i></span><span class="sup">(<span class="num">{{row.comments}}</span>)</span></a></span>

<a href=# data-action='flag' data-toggle="tooltip" title="Flag this feed item as inappropriate." data-affirmative=flagged data-negative=unflagged data-state="{% if row.flagged %}flagged{% else %}unflagged{%endif%}" data-pk={{row.pk}} class="flag_activity"><span class="action {% if row.flagged %}open{%endif%}"><i class="far fa-flag"></i></span></a>

<a class="action copy_activity" data-toggle="tooltip" title="Copy a link to this feed item." href=# data-url={{row.url}}><i class="fas fa-link"></i></a>

<i class="fas fa-circle-notch fa-spin loading blue hidden"></i>
Expand All @@ -250,7 +248,7 @@
{% elif row.metadata.quest_reward %}
<img src="{{row.metadata.quest_reward}}" alt="" class="w-100" style="max-width:100px;">
{% else %}
<i class="far {{ row.icon }} last-icon"></i>
<a href=# data-action='flag' data-toggle="tooltip" title="Flag this feed item as inappropriate." data-affirmative=flagged data-negative=unflagged data-state="{% if row.flagged %}flagged{% else %}unflagged{%endif%}" data-pk={{row.pk}} class="flag_activity"><span class="action {% if row.flagged %}open{%endif%}"><i class="far fa-flag"></i></span></a>
{% endif %}
</div>
</div>

0 comments on commit 29ea3d1

Please sign in to comment.