Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client

This commit is contained in:
Maxim Khlobystov 2015-05-22 11:30:17 -07:00
commit a127b1e0d1
4 changed files with 16 additions and 6 deletions

View File

@ -1,7 +1,7 @@
<template name="header">
<nav id="navbar" class="myNavbar gradientBar top-bar" role="navigation">
{{#if getInSession "display_usersList"}}
{{> makeButton btn_class="toggleUserlistButton navbarButton" i_class="ion-navicon-round" rel="tooltip" data_placement="bottom" title="Close Userlist"}}
{{> makeButton btn_class="toggleUserlistButton navbarButton pressedButton" i_class="ion-navicon-round" rel="tooltip" data_placement="bottom" title="Close Userlist"}}
{{else}}
{{> makeButton btn_class="toggleUserlistButton navbarButton" i_class="ion-navicon-round" rel="tooltip" data_placement="bottom" title="Open Userlist"}}
{{/if}}
@ -37,7 +37,7 @@
title="Logout"}}
</div>
{{#if getInSession "display_menu"}}
{{> makeButton btn_class="toggleMenuButton navbarButton" i_class="ion-navicon-round" rel="tooltip" data_placement="bottom" title="Close Menu"}}
{{> makeButton btn_class="toggleMenuButton navbarButton pressedButton" i_class="ion-navicon-round" rel="tooltip" data_placement="bottom" title="Close Menu"}}
{{else}}
{{> makeButton btn_class="toggleMenuButton navbarButton" i_class="ion-navicon-round" rel="tooltip" data_placement="bottom" title="Open Menu"}}
{{/if}}

View File

@ -194,6 +194,7 @@ body {
background-color: black;
opacity: 0.5;
z-index: 1;
cursor: pointer;
@media @landscape, @desktop-portrait {
top: 50px;
}
@ -369,6 +370,12 @@ body {
}
}
.pressedButton {
i {
color: extract(@azure, 2);
}
}
.toggleUserlist {
width: 57px;
margin-right: 10px;

View File

@ -76,4 +76,7 @@
.closeUserlistIcon {
float: right;
margin-right: 5px;
@media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
display: none;
}
}

View File

@ -2,14 +2,14 @@
#whiteboard {
padding: 0 !important;
-webkit-flex: 2 2 50%;
-moz-flex: 2 2 50%;
-ms-flex: 2 2 50%;
flex: 2 2 50%;
min-width: 0;
@media @landscape {
-webkit-order: 2;
order: 2;
-webkit-flex: 7 7 70%;
-moz-flex: 7 7 70%;
-ms-flex: 7 7 70%;
flex: 7 7 70%;
min-width: 50%;
height: 100%;
}