Fix toolbar rendering on XS screens

Fix #89
master
Daniel Berteaud 10 years ago
parent eef3002a8e
commit 79ff17c2a8
  1. 3
      public/css/vroom.css
  2. 14
      templates/default/join.html.ep

@ -4,6 +4,9 @@
font-weight: 400; font-weight: 400;
src: url(../fonts/shortstack.woff2) format('woff2'), url(../fonts/shortstack.woff) format('woff'); src: url(../fonts/shortstack.woff2) format('woff2'), url(../fonts/shortstack.woff) format('woff');
} }
.navbar-btn-group {
border-color: transparent !important;
}
#webRTCVideo { #webRTCVideo {
overflow-y: auto; overflow-y: auto;
} }

@ -29,7 +29,7 @@
</div> </div>
<input id="roomName" name="roomName" type="hidden" value="<%= $room %>"/> <input id="roomName" name="roomName" type="hidden" value="<%= $room %>"/>
<div id="roomToolBar" class="collapse navbar-collapse"> <div id="roomToolBar" class="collapse navbar-collapse">
<div class="navbar-form navbar-left input-group"> <div class="navbar-form navbar-btn-group navbar-left input-group">
<div class="input-group"> <div class="input-group">
<input type="text" id="displayName" class="form-control help" placeholder="<%=l 'YOUR_NAME' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'NAME_SENT_TO_OTHERS' %>"/> <input type="text" id="displayName" class="form-control help" placeholder="<%=l 'YOUR_NAME' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'NAME_SENT_TO_OTHERS' %>"/>
<span class="input-group-btn"> <span class="input-group-btn">
@ -40,7 +40,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="btn-group navbar-form navbar-left"> <div class="btn-group navbar-form navbar-btn-group navbar-left">
<% if ($etherpad eq 'true'){ %> <% if ($etherpad eq 'true'){ %>
<div class="btn-group"> <div class="btn-group">
<% } %> <% } %>
@ -63,7 +63,7 @@
</div> </div>
</div> </div>
<% } %> <% } %>
<div class="btn-group navbar-form navbar-left" data-toggle="buttons"> <div class="btn-group navbar-form navbar-btn-group navbar-left" data-toggle="buttons">
<label class="btn btn-default help" id="muteMicLabel" data-toggle="tooltip" data-placement="bottom" title="<%=l 'MUTE_MIC' %>"> <label class="btn btn-default help" id="muteMicLabel" data-toggle="tooltip" data-placement="bottom" title="<%=l 'MUTE_MIC' %>">
<input type="checkbox" id="muteMicButton"> <input type="checkbox" id="muteMicButton">
<span class="glyphicon glyphicon-volume-off"> <span class="glyphicon glyphicon-volume-off">
@ -80,14 +80,14 @@
</span> </span>
</label> </label>
</div> </div>
<div class="btn-group navbar-form navbar-left hidden-xs aloneEl" data-toggle="buttons"> <div class="btn-group navbar-form navbar-btn-group navbar-left hidden-xs aloneEl" data-toggle="buttons">
<label class="btn btn-default help" id="pauseMohLabel" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PAUSE_MOH' %>"> <label class="btn btn-default help" id="pauseMohLabel" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PAUSE_MOH' %>">
<input type="checkbox" id="pauseMohButton"> <input type="checkbox" id="pauseMohButton">
<span class="glyphicon glyphicon-music"> <span class="glyphicon glyphicon-music">
</span> </span>
</label> </label>
</div> </div>
<div class="btn-group navbar-form navbar-left"> <div class="btn-group navbar-form navbar-btn-group navbar-left">
<div class="btn-group ownerEl"> <div class="btn-group ownerEl">
<button class="btn btn-default help" type="button" data-toggle="modal" data-target="#inviteModal" data-toggle="tooltip" data-placement="bottom" title="<%=l 'INVITE_PEOPLE' %>"> <button class="btn btn-default help" type="button" data-toggle="modal" data-target="#inviteModal" data-toggle="tooltip" data-placement="bottom" title="<%=l 'INVITE_PEOPLE' %>">
<span class="glyphicon glyphicon-user"> <span class="glyphicon glyphicon-user">
@ -101,13 +101,13 @@
</button> </button>
</div> </div>
</div> </div>
<div class="btn-group navbar-form navbar-left"> <div class="btn-group navbar-form navbar-btn-group navbar-left">
<button class="btn btn-default dropdown-toggle help unauthEl" data-toggle="modal" data-target="#ownerAuthModal" data-toggle="dropdown" data-toggle="tooltip" data-placement="bottom" title="<%=l 'AUTHENTICATE' %>"> <button class="btn btn-default dropdown-toggle help unauthEl" data-toggle="modal" data-target="#ownerAuthModal" data-toggle="dropdown" data-toggle="tooltip" data-placement="bottom" title="<%=l 'AUTHENTICATE' %>">
<span class="glyphicon glyphicon-log-in"> <span class="glyphicon glyphicon-log-in">
</span> </span>
</button> </button>
</div> </div>
<div class="navbar-form navbar-right hidden-xs" data-toggle="buttons" > <div class="navbar-form navbar-btn-group navbar-right hidden-xs" data-toggle="buttons" >
<div class="btn-group"> <div class="btn-group">
<div class="btn btn-default disabled"> <div class="btn btn-default disabled">
<span class="glyphicon glyphicon glyphicon-hourglass"> <span class="glyphicon glyphicon glyphicon-hourglass">

Loading…
Cancel
Save