On XS screens, display the timecounter in the navbar

This commit is contained in:
Daniel Berteaud 2015-01-20 16:36:25 +01:00
parent 2dd357f534
commit 527ab348b4
3 changed files with 6 additions and 5 deletions

View File

@ -215,9 +215,6 @@
#chromeExtMessage {
text-align: center;
}
#timeCounter {
display: none;
}
#navBarLogo {
padding-top: 2px;
float: left;

View File

@ -1526,7 +1526,7 @@ function initVroom(room) {
});
checkMoh();
$('#videoLocalContainer').show(200);
$('#timeCounter').tinyTimer({ from: new Date }).show(200);
$('#timeCounterXs,#timeCounter').tinyTimer({ from: new Date });
});
// Handle new video stream added: someone joined the room

View File

@ -3,6 +3,9 @@
<div class="container-fluid">
<nav id="toolbar" class="navbar navbar-default" role="toolbar">
<div class="navbar-header">
<div id="timeCounterXs" class="btn btn-default navbar-btn disabled hidden-sm hidden-md hidden-lg col-xs-offset-1">
00:00
</div>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#roomToolBar">
<span class="sr-only">
</span>
@ -246,7 +249,8 @@
<span class="glyphicon glyphicon-question-sign">
</span>
</button>
<div id="timeCounter" class="btn btn-default disabled">
<div id="timeCounter" class="btn btn-default disabled hidden-xs">
00:00
</div>
<button class="btn btn-default help" id="logoutButton" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
<span class="glyphicon glyphicon-log-out">