Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove duplicate icon closing tag #6248

Merged
merged 2 commits into from
Mar 20, 2020
Merged

remove duplicate icon closing tag #6248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9dd5a8
remove duplicate icon closing tags
walidmujahid Mar 17, 2020
e1904e8
Merge branch 'master' into remove-duplicate-icon-closing-tag
thelostone-mc Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions app/dashboard/templates/profiles/status_box.html
View file
Open in desktop
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
View file
Open in desktop
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