Skip to content

Commit

Permalink
Merge pull request #6248 from walidmujahid/remove-duplicate-icon-clos…
Browse files Browse the repository at this point in the history
…ing-tag

remove duplicate icon closing tag
  • Loading branch information
thelostone-mc authored Mar 20, 2020
2 parents 33ab7b5 + e1904e8 commit a55de14
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
9 changes: 5 additions & 4 deletions app/dashboard/templates/profiles/status_box.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@
></textarea>
<input type="hidden" name="what" value="{{what}}:{{whatid}}">
<div id="textarea-dropdown" class="dropdown-menu" style="top: initial; left: initial;"></div>

{% if is_alpha_tester %}
<button id="video-button" class="btn btn-clean position-absolute" data-toggle="tooltip" title="Add a video call to post." style="bottom: 2.5em; right: 1.5em;"><i class="fas fa-video"></i></i></button>
{% endif %}
<button class="btn btn-clean position-absolute click-gif" data-toggle="tooltip" title="Add a gif to post." data-toggle="dropdown" id="btn_gif" aria-haspopup="true" aria-expanded="false" style="bottom: 1em; right: 1.5em;">
<i class="fas fa-images mr-2"></i>
</button>
<button class="btn btn-clean position-absolute click-gif" data-toggle="tooltip" title="Add a gif to post." data-toggle="dropdown" id="btn_gif" aria-haspopup="true" aria-expanded="false" style="bottom: 1em; right: 1.5em;">
<i class="fas fa-images mr-2"></i>
</button>

<button id="poll-button" class="btn btn-clean position-absolute" data-toggle="tooltip" title="Add a poll to post." style="bottom: 1em; right: 0em;"><i class="fas fa-chart-bar"></i></i></button>
<button id="poll-button" class="btn btn-clean position-absolute" data-toggle="tooltip" title="Add a poll to post." style="bottom: 1em; right: 0em;"><i class="fas fa-chart-bar"></i></button>
<button id="emoji-button" class="btn btn-clean position-absolute" data-toggle="tooltip" title="Add an emoji to post." style="bottom: 2.5em; right: 0;"><i class="far fa-smile"></i></button>
</div>
<div class="btn-group-toggle text-center text-md-left activity_type_selector" data-toggle="buttons">
Expand Down
9 changes: 4 additions & 5 deletions app/townsquare/templates/townsquare/shared/shareactivity.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@
{% if is_alpha_tester %}
<button id="video-button" class="btn btn-clean position-absolute" data-toggle="tooltip" title="Add a video call to post." style="bottom: 3.5em; right: 1.5em;"><i class="fas fa-video"></i></i></button>
{% endif %}
<button class="btn btn-clean position-absolute click-gif" data-toggle="tooltip" title="Add a gif to post." data-toggle="dropdown" id="btn_gif" aria-haspopup="true" aria-expanded="false" style="bottom: 2em; right: 1.5em;">
<i class="fas fa-images mr-2"></i>
</button>

<button id="poll-button" class="btn btn-clean position-absolute" data-toggle="tooltip" title="Add a poll to post." style="bottom: 2em; right: 0em;"><i class="fas fa-chart-bar"></i></i></button>
<button class="btn btn-clean position-absolute click-gif" data-toggle="tooltip" title="Add a gif to post." data-toggle="dropdown" id="btn_gif" aria-haspopup="true" aria-expanded="false" style="bottom: 2em; right: 1.5em;">
<i class="fas fa-images mr-2"></i>
</button>
<button id="poll-button" class="btn btn-clean position-absolute" data-toggle="tooltip" title="Add a poll to post." style="bottom: 2em; right: 0em;"><i class="fas fa-chart-bar"></i></button>
<button id="emoji-button" class="btn btn-clean position-absolute" data-toggle="tooltip" title="Add an emoji to post." style="bottom: 3.5em; right: 0;"><i class="far fa-smile"></i></button>
</div>
<input type="hidden" name="what" value="{{what}}:{{whatid}}">
Expand Down

0 comments on commit a55de14

Please sign in to comment.