Merge branch 'master' into scrollbar

This commit is contained in:
Beatrice Olivera
2018-09-06 12:49:02 +01:00
committed by GitHub
6 changed files with 38 additions and 13 deletions

View File

@@ -31,16 +31,17 @@
<option value="<%= language.code %>"><%= language.name %></option>
<% end %>
</select>
<span class="input-group-addon" style="width:0px; padding-left:0px; padding-right:0px; border:none;"></span>
<input type="text" class="form-control input-transparent" name="chat-input" id="chat-input" value="" placeholder="Type something...">
<span class="input-group-btn">
<button class="form-control send-button" id="send-btn" type="submit" remote: true>
<i class="fas fa-paper-plane"></i>
</button>
</span>
<!-- <span class="input-group-btn">
<button class="btn btn-danger form-control" id="original-btn" type="submit" remote: true>Show Original</button>
</span> -->
<form class="form-inline" id="chat-form">
<span class="input-group-addon" style="width:0px; padding-left:0px; padding-right:0px; border:none;"></span>
<input type="text" class="form-control input-transparent" name="chat-input" id="chat-input" value="" placeholder="Type something...">
<span class="input-group-btn">
<button class="form-control send-button" id="send-btn" type="submit" remote: true>
<i class="fas fa-paper-plane"></i>
</button>
</span>
</form>
</div>
</div>
</div>