Merge branch 'meteor-client-device-orientation' of https://github.com/gthacoder/bigbluebutton into meteor-client-device-orientation

This commit is contained in:
Anton Georgiev 2015-02-03 18:20:53 +00:00
commit 24b26f450e
8 changed files with 228 additions and 228 deletions

View File

@ -1,6 +1,6 @@
@import "../colors";
@media all and (orientation: landscape) {
@media all and (orientation: landscape) and (min-device-aspect-ratio: 1/1) {
#chat {
-webkit-order: 3;
order: 3;

View File

@ -1,7 +1,7 @@
@import "../colors";
@import "../mixins";
@media all and (orientation: landscape) {
@media all and (orientation: landscape) and (min-device-aspect-ratio: 1/1) {
body {
height: 100%;
min-width: 768px;

View File

@ -1,4 +1,4 @@
@media all and (orientation: landscape) {
@media all and (orientation: landscape) and (min-device-aspect-ratio: 1/1) {
#username {
display:block;
width:70%;

View File

@ -1,4 +1,4 @@
@media all and (orientation: landscape) {
@media all and (orientation: landscape) and (min-device-aspect-ratio: 1/1) {
#whiteboard {
-webkit-order: 2;
order: 2;

View File

@ -1,56 +1,56 @@
@import "../colors";
@media all and (orientation: portrait) {
@media all and (orientation: portrait), all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) {
#chat {
-webkit-order: 2;
order: 2;
min-height: 40%;
max-height: 40%;
}
}
@media (max-device-width: 1279px) {
.chat {
li {
td {
font-size: 30px;
}
div {
font-size: 15px;
}
@media all and (orientation: portrait) and (max-device-aspect-ratio: 1/1), all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) {
.chat {
li {
td {
font-size: 30px;
}
}
#newMessageInput {
height: 60px;
font-size: 25px;
}
#sendMessageButton {
height: 60px;
width: 100px;
font-size: 30px;
}
#tabsList {
a {
font-size: 25px;
div {
font-size: 15px;
}
}
}
@media (min-device-width: 1280px) {
#newMessageInput {
height: 40px;
}
#newMessageInput {
height: 60px;
font-size: 25px;
}
#sendMessageButton {
height: 40px;
}
#sendMessageButton {
height: 60px;
width: 100px;
font-size: 30px;
}
#tabsList {
a {
font-size: 12px;
}
#tabsList {
a {
font-size: 25px;
}
}
}
@media all and (orientation: portrait) and (min-device-aspect-ratio: 1/1) {
#newMessageInput {
height: 40px;
}
#sendMessageButton {
height: 40px;
}
#tabsList {
a {
font-size: 12px;
}
}
}

View File

@ -1,7 +1,7 @@
@import "../colors";
@import "../mixins";
@media all and (orientation: portrait) {
@media all and (orientation: portrait), all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) {
body {
position: relative;
top: 15px;
@ -14,185 +14,185 @@
min-height: 125%;
max-height: 125%;
}
}
@media (max-device-width: 1279px) {
.myNavbar {
min-width: 630px;
}
@media all and (orientation: portrait) and (max-device-aspect-ratio: 1/1), all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) {
.myNavbar {
min-width: 630px;
}
.navbarButton {
height: 100px;
width: 10%;
min-width: 60px;
}
.navbarButton {
height: 100px;
width: 10%;
min-width: 60px;
}
.navbarTitle {
font-size: 30px;
padding-top: 30px;
padding-left: 5px;
overflow: hidden;
height: 72px;
width: 70%;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: auto;
margin-right: auto;
}
.navbarTitle {
font-size: 30px;
padding-top: 30px;
padding-left: 5px;
overflow: hidden;
height: 72px;
width: 70%;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: auto;
margin-right: auto;
}
.title {
font-size: 30px;
}
.title {
font-size: 30px;
}
.glyphicon, .ion-android-hand, .ion-volume-mute {
font-size: 35px;
}
.glyphicon, .ion-android-hand, .ion-volume-mute {
font-size: 35px;
}
.ion-volume-mute {
font-size: 50px;
}
.ion-volume-mute {
font-size: 50px;
}
.hiddenNavbarSection {
display: none;
}
.hiddenNavbarSection {
display: none;
}
/* Logout dialog */
/* Logout dialog */
.logout-dialog.ui-dialog {
.ui-widget-header {
font-size: 40px;
}
}
.logout-dialog.ui-widget-content {
font-size: 280%;
}
.ui-dialog-buttonset {
width: 100%;
}
.ui-dialog-buttonset button {
width: 40%;
margin-left: 5% !important;
margin-right: 5% !important;
}
/* Sliding menu */
.sliding-menu {
width: 15%;
height: 100%;
position: fixed;
top: 0;
left: -15%;
z-index: 1031;
&.sliding-menu-opened {
left: 0px;
}
a {
border-bottom: 1px solid #258ecd;
padding: 1em;
}
}
.slideSection {
float: left;
margin-top: 100px;
height: 100%;
width: 100%;
}
.slideButton {
display: block;
width: 100%;
height: calc(~'20% - 20px');
}
.slideSection {
margin-bottom: 0.5%;
&.gradientBar {
.linear-gradient(rgb(72,76,85), rgb(65,68,77));
}
.btn {
.linear-gradient(rgb(72,76,85), rgb(65,68,77));
border-left: 1px solid extract(@darkGrey, 2);
border-right: 1px solid extract(@darkGrey, 4);
&.navbarIconToggleActive {
background: extract(@darkGrey, 3);
border-bottom: 4px solid extract(@azure, 1);
}
i {
color: extract(@white, 1);
}
}
}
#darkened-screen {
display: none;
background: black;
opacity: 0.7;
z-index: 1030;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
.logout-dialog.ui-dialog {
.ui-widget-header {
font-size: 40px;
}
}
@media (min-device-width: 1280px) {
.myNavbar {
min-width: 400px;
.logout-dialog.ui-widget-content {
font-size: 280%;
}
.ui-dialog-buttonset {
width: 100%;
}
.ui-dialog-buttonset button {
width: 40%;
margin-left: 5% !important;
margin-right: 5% !important;
}
/* Sliding menu */
.sliding-menu {
width: 15%;
height: 100%;
position: fixed;
top: 0;
left: -15%;
z-index: 1031;
&.sliding-menu-opened {
left: 0px;
}
.navbarButton {
height: 50px;
width: 51.2px;
a {
border-bottom: 1px solid #258ecd;
padding: 1em;
}
}
.navbarTitle {
font-size: 16px;
padding-top: 13px;
width: calc(~'100% - 102.4px');
.slideSection {
float: left;
margin-top: 100px;
height: 100%;
width: 100%;
}
.slideButton {
display: block;
width: 100%;
height: calc(~'20% - 20px');
}
.slideSection {
margin-bottom: 0.5%;
&.gradientBar {
.linear-gradient(rgb(72,76,85), rgb(65,68,77));
}
.narrowedNavbarTitle {
width: calc(~'100% - 358.4px') !important;
}
.title {
font-size: 14px;
}
.ion-volume-mute {
font-size: 20px;
}
#main {
padding-top: 0;
}
.collapseNavbarSection {
display: none;
}
#collapseButtonSection {
display: block !important;
}
/* Logout dialog */
.logout-dialog.ui-dialog {
.ui-widget-header {
font-size: 12px;
.btn {
.linear-gradient(rgb(72,76,85), rgb(65,68,77));
border-left: 1px solid extract(@darkGrey, 2);
border-right: 1px solid extract(@darkGrey, 4);
&.navbarIconToggleActive {
background: extract(@darkGrey, 3);
border-bottom: 4px solid extract(@azure, 1);
}
.ui-dialog-content {
font-size: 11px;
i {
color: extract(@white, 1);
}
}
}
.logout-dialog.ui-widget-content {
font-size: 10px;
}
#darkened-screen {
display: none;
background: black;
opacity: 0.7;
z-index: 1030;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
}
@media all and (orientation: portrait) and (min-device-aspect-ratio: 1/1) {
.myNavbar {
min-width: 400px;
}
.navbarButton {
height: 50px;
width: 51.2px;
}
.navbarTitle {
font-size: 16px;
padding-top: 13px;
width: calc(~'100% - 102.4px');
}
.narrowedNavbarTitle {
width: calc(~'100% - 358.4px') !important;
}
.title {
font-size: 14px;
}
.ion-volume-mute {
font-size: 20px;
}
#main {
padding-top: 0;
}
.collapseNavbarSection {
display: none;
}
#collapseButtonSection {
display: block !important;
}
/* Logout dialog */
.logout-dialog.ui-dialog {
.ui-widget-header {
font-size: 12px;
}
.ui-dialog-content {
font-size: 11px;
}
}
.logout-dialog.ui-widget-content {
font-size: 10px;
}
}

View File

@ -1,35 +1,35 @@
@media all and (orientation: portrait) {
@media all and (orientation: portrait), all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) {
#users {
-webkit-order: 3;
order: 3;
min-height: 20%;
max-height: 20%;
}
}
@media (max-device-width: 1279px) {
.userNameEntry {
height: 35px;
font-size: 30px;
strong {
font-size: 25px;
}
}
}
@media (min-device-width: 1280px) {
#username {
display:block;
width:70%;
}
#user-contents {
.userlist {
padding:10px;
}
}
.userNameEntry {
height: 20px;
@media all and (orientation: portrait) and (max-device-aspect-ratio: 1/1), all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) {
.userNameEntry {
height: 35px;
font-size: 30px;
strong {
font-size: 25px;
}
}
}
@media all and (orientation: portrait) and (min-device-aspect-ratio: 1/1) {
#username {
display:block;
width:70%;
}
#user-contents {
.userlist {
padding:10px;
}
}
.userNameEntry {
height: 20px;
}
}

View File

@ -1,4 +1,4 @@
@media all and (orientation: portrait) {
@media all and (orientation: portrait), all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) {
#whiteboard {
-webkit-order: 1;
order: 1;