BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'meteor-client-post-summit-merge' of github.com:gthacoder/bigbluebutton into meteor-ui-less

Browse Source
This commit is contained in:
Anton Georgiev 2014-11-28 20:50:45 +00:00
commit e5841a96d5
7 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
labs/demos/views/index.html
View File

@ -78,7 +78,7 @@
<div class="login-banner">
<form class="login-form" ng-submit="postUsername()">
<label>Username:</label>
<input type="text" ng-model="username" placeholder="Enter Your Name" required>
<input type="text" ng-model="username" placeholder="Enter Your Name" required autofocus>
<label>Meeting name:</label>
<input type="text" ng-model="meetingName" placeholder="Demo Meeting">
<input type="submit" value="Send" class="success">

1
labs/meteor-client/app/.meteor/packages
View File

@ -14,7 +14,6 @@ iron:router
blaze
less
sanjo:jasmine
velocity:core
francocatena:status
mizzao:jquery-ui
mrt:external-file-loader@0.1.4

5
labs/meteor-client/app/.meteor/versions
View File

@ -39,14 +39,14 @@ json@1.0.1
launch-screen@1.0.0
less@1.0.11
livedata@1.0.11
mizzao:build-fetcher@0.2.0
mizzao:jquery-ui@1.11.2
logging@1.0.5
meteor-platform@1.2.0
meteor@1.1.3
minifiers@1.1.2
minimongo@1.0.5
mizzao:bootstrap-3@3.3.0
mizzao:build-fetcher@0.2.0
mizzao:jquery-ui@1.11.2
mobile-status-bar@1.0.1
mongo@1.0.8
mrt:external-file-loader@0.1.4
@ -72,6 +72,5 @@ tracker@1.0.3
ui@1.0.4
underscore@1.0.1
url@1.0.2
velocity:core@0.2.14
webapp-hashing@1.0.1
webapp@1.1.4

30
labs/meteor-client/app/client/stylesheets/chat.less
View File

@ -1,3 +1,5 @@
@import "colors";
bottomEntry {
border: none;
padding-bottom: 0px;
@ -11,10 +13,10 @@ bottomEntry {
}
#chat {
background-color: #f5f5f5;
border: 1px solid #ccc;
background-color: extract(@white, 2);
border: 1px solid extract(@lightGrey, 3);
float: left;
background:#fff;
background: extract(@white, 1);
margin-right: 0.5%;
min-height: 500px;
overflow: hidden;
@ -32,7 +34,7 @@ bottomEntry {
.chatBarIcon {}
#chatbar-contents {
background-color: #fff;
background-color: extract(@white, 1);
height: 90%;
padding-left: 0px;
padding-right: 0px;
@ -56,7 +58,7 @@ bottomEntry {
}
#chat-options-bar {
border-bottom: 1px solid #ccc;
border-bottom: 1px solid extract(@lightGrey, 3);
position: relative;
width: 100%;
}
@ -66,16 +68,16 @@ bottomEntry {
.closeTab {
background: transparent;
border: 0;
color: #000;
color: @black;
cursor: pointer;
float: left;
font-weight: bold;
padding: 0;
text-shadow: 0 1px 0 #fff;
text-shadow: 0 1px 0 extract(@white, 1);
-webkit-appearance: none;
}
.gotUnreadMail{
background: #F9DF6B !important;
background: extract(@yellow, 2) !important;
}
#MoreChatsDrop {
@ -97,7 +99,7 @@ bottomEntry {
resize: none;
padding:5px;
border-radius:4px;
border:1px solid #ccc;
border:1px solid extract(@lightGrey, 3);
}
.optionsBar {
@ -110,7 +112,7 @@ bottomEntry {
bottom: 0px;
padding: 10px;
position: relative;
background:#fff;
background: extract(@white, 1);
}
.privateChatTab {}
@ -127,7 +129,7 @@ bottomEntry {
.private-chat-user-list {font-size: 12px;}
.private-chat-user-list :hover {
background: #0099FF;
background: extract(@azure, 2);
font-size: 14px;
font-style: italic;
}
@ -135,10 +137,10 @@ bottomEntry {
.publicChatTab {}
#sendMessageButton {
background-color: #54A7DB;
background-color: extract(@azure, 1);
height: 40px;
margin-left: 8px;
color:#fff;
color: extract(@white, 1);
}
#tabsList {
@ -159,7 +161,7 @@ bottomEntry {
text-overflow: ellipsis;
white-space: nowrap;
font-size:12px;
color: #999;
color: extract(@lightGrey, 4);
margin: 0;
border-top: 0;
border-radius: 0;

7
labs/meteor-client/app/client/stylesheets/colors.less Executable file
View File

@ -0,0 +1,7 @@
/* sorted by brightness */
@white: #fff, #f5f5f5, #eee;
@lightGrey: #d7d7d7, #cccdd1, #ccc, #999;
@darkGrey: #666, #60636a, #40434c, #32353e;
@azure: #54a7db, #0099FF;
@black: #000;
@yellow: #E3E1B8, #F9DF6B;

46
labs/meteor-client/app/client/stylesheets/style.css → labs/meteor-client/app/client/stylesheets/style.less
View File

@ -1,9 +1,11 @@
@import "colors";
.audioFeedIcon {}
body {
background: #eee;
background: extract(@white, 3);
bottom: 0;
color: #666666;
color: extract(@darkGrey, 1);
height: 100%;
left: 0;
min-width: 768px;
@ -12,14 +14,14 @@ body {
top: 0;
}
.btn {background-color: #F5F5F5;}
.btn {background-color: extract(@white, 2);}
.component {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
background: #fff;
background: extract(@white, 1);
border-radius: 4px;
border: 1px solid #ccc;
border: 1px solid extract(@lightGrey, 3);
float: left;
height: 80%;
margin-top: 10px;
@ -58,19 +60,19 @@ body {
}
.myNavbar .btn.navbarIconToggleActive {
background: #40434c;
border-bottom: 4px solid #54a7db;
background: extract(@darkGrey, 3);
border-bottom: 4px solid extract(@azure, 1);
}
.myNavbar .btn {
border-left: 1px solid #60636a;
border-right: 1px solid #32353e;
border-left: 1px solid extract(@darkGrey, 2);
border-right: 1px solid extract(@darkGrey, 4);
}
.myNavbar .btn i {color: #fff;}
.myNavbar .btn i {color: extract(@white, 1);}
.myNavbarMinimized {
background: #eee;
background: extract(@white, 3);
height: 20px;
margin-bottom: 0.2%;
margin-top: 0px;
@ -91,7 +93,7 @@ body {
width: 100%;
}
.navbarIconToggleActive i {color: #cccdd1;}
.navbarIconToggleActive i {color: extract(@lightGrey, 2);}
#navbarMinimizedButton {
margin-bottom: 0px;
@ -126,7 +128,7 @@ body {
}
.navbarTitle {
color: #fff;
color: extract(@white, 1);
display: block;
float: left;
font-size: 16px;
@ -145,7 +147,7 @@ body {
.navbarUserButtons .btn:hover,
.navbarSettingsButtons .btn:hover {
background: #40434c;
background: extract(@darkGrey, 3);
}
.panel-footer {padding: 0;}
@ -177,8 +179,8 @@ body {
.table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td {border-top: 0px;}
.title {
border-bottom: 1px solid #d7d7d7;
color: #666;
border-bottom: 1px solid extract(@lightGrey, 1);
color: extract(@darkGrey, 1);
font-size: 14px;
font-weight: bold;
line-height: 2em;
@ -194,13 +196,13 @@ body {
.no-close .ui-dialog-titlebar-close {
display: none; /* no close button */
}
}
.logout-dialog.ui-dialog .ui-widget-header {
color: #fff;
color: extract(@white, 1);
font-size: 12px;
font-weight: bold;
background: #40434c;
background: extract(@darkGrey, 3);
}
.logout-dialog.ui-dialog .ui-dialog-content {
@ -211,10 +213,10 @@ body {
.logout-dialog.ui-widget-content {
font-size: 10px;
background: #eee;
border: 5px solid #40434c;
background: extract(@white, 3);
border: 5px solid extract(@darkGrey, 3);
}
.custom-button {
background-color: #E3E1B8;
background-color: extract(@yellow, 1);
}

4
labs/meteor-client/app/client/stylesheets/users.less
View File

@ -1,3 +1,5 @@
@import "colors";
#users {
margin-left: 0.5%;
padding-bottom: 10px; /*min-width:230px;*/
@ -14,7 +16,7 @@
.userListSettingIcon {}
.userNameContainer {
border-right: 1px solid #ccc;
border-right: 1px solid extract(@lightGrey, 3);
padding-right: 0px;
}