Merge branch 'meteor-style-changes' of github.com:antobinary/bigbluebutton into testing-version-005
This commit is contained in:
Anton Georgiev
commit
c68fc184d3
@ -4,16 +4,86 @@
|
||||
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.4/angular.min.js"></script>
|
||||
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
|
||||
<script src="../public/js/app.js"></script>
|
||||
|
||||
|
||||
<style>
|
||||
body {
|
||||
margin:0;
|
||||
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
|
||||
font-size: 14px;
|
||||
line-height: 1.42857143;
|
||||
}
|
||||
.login { }
|
||||
.login-banner {
|
||||
background:#f2f2f2;
|
||||
height:325px;
|
||||
border-bottom: 1px solid rgba(0,0,0,.05);
|
||||
}
|
||||
.login-form {
|
||||
width:25%;
|
||||
margin:0 auto;
|
||||
background:#fff;
|
||||
border:1px solid #ddd;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
top:45%;
|
||||
padding:40px;
|
||||
display:block;
|
||||
position: relative;
|
||||
-webkit-box-shadow: inset 0 3px 6px rgba(0,0,0,.05);
|
||||
box-shadow: inset 0 3px 6px rgba(0,0,0,.05);
|
||||
}
|
||||
.login-form label {
|
||||
display: inline-block;
|
||||
max-width: 100%;
|
||||
margin-bottom: 5px;
|
||||
font-weight: 700;
|
||||
}
|
||||
.login-form input {
|
||||
display: block;
|
||||
width: 100%;
|
||||
padding: 12px 18px;
|
||||
font-size: 14px;
|
||||
line-height: 1.42857143;
|
||||
background-image: none;
|
||||
border: 1px solid #c7cdd1;
|
||||
border-radius: 4px;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
|
||||
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
|
||||
-webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
|
||||
-o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
|
||||
transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
|
||||
margin-bottom: 20px;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.success {
|
||||
color: #FFF;
|
||||
background: #54A7DB;
|
||||
border:0 !important;
|
||||
}
|
||||
.success:hover {
|
||||
background: #4695c6;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<div ng-controller="MainCtrl">
|
||||
<form ng-submit="postUsername()">
|
||||
<label>Username:</label>
|
||||
<input type="text" ng-model="username" placeholder="Enter Your Name" required>
|
||||
<label>Meeting name:</label>
|
||||
<input type="text" ng-model="meetingName" placeholder="Demo Meeting"><br/>
|
||||
<input type="submit" value="Send"><br/><br/>
|
||||
</form>
|
||||
<div class="login" ng-controller="MainCtrl">
|
||||
<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>
|
||||
<label>Meeting name:</label>
|
||||
<input type="text" ng-model="meetingName" placeholder="Demo Meeting">
|
||||
<input type="submit" value="Send" class="success">
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -65,8 +65,8 @@
|
||||
<div class="navbarTitle navbarSection"><span>{{getMeetingName}}</span></div>
|
||||
<div class="navbarSettingsButtons navbarSection">
|
||||
<!-- {{> makeButton id="userId" btn_class="settingsIcon navbarButton" i_class="cog" rel="tooltip" data_placement="bottom" title="Settings"}} -->
|
||||
<!-- {{> makeButton btn_class="hideNavbarIcon navbarButton" i_class="chevron-up" rel="tooltip" data_placement="bottom" title="Hide Navbar"}} -->
|
||||
{{> makeButton btn_class="signOutIcon navbarButton" i_class="log-out" rel="tooltip" data_placement="bottom" title="Logout"}}
|
||||
{{> makeButton btn_class="hideNavbarIcon navbarButton" i_class="chevron-up" rel="tooltip" data_placement="bottom" title="Hide Navbar"}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="navbarFiller"></div>
|
||||
|
||||
@ -51,7 +51,9 @@ bottomEntry {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.chat-input-wrapper {margin-left: 20px;}
|
||||
.chat-input-wrapper {
|
||||
padding:10px;
|
||||
}
|
||||
|
||||
#chat-options-bar {
|
||||
border-bottom: 1px solid #ccc;
|
||||
@ -133,13 +135,13 @@ bottomEntry {
|
||||
.publicChatTab {}
|
||||
|
||||
#sendMessageButton {
|
||||
background-color: #D7D7D7;
|
||||
background-color: #54A7DB;
|
||||
height: 40px;
|
||||
margin-left: 10px;
|
||||
margin-left: 8px;
|
||||
color:#fff;
|
||||
}
|
||||
|
||||
#tabsList {
|
||||
border-spacing: 3px; /* space between each tab */
|
||||
display: table;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
@ -149,9 +151,6 @@ bottomEntry {
|
||||
}
|
||||
|
||||
#tabsList a {
|
||||
background-color: #C9E6FF;
|
||||
border-radius: 10px 10px 0 0;
|
||||
color: darkblue;
|
||||
display: block;
|
||||
min-height: 100%;
|
||||
overflow: hidden;
|
||||
@ -159,21 +158,19 @@ bottomEntry {
|
||||
text-decoration: none;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
font-size:12px;
|
||||
color: #999;
|
||||
margin: 0;
|
||||
border-top: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
#tabsList li:first-child a {
|
||||
border-left:0;
|
||||
}
|
||||
|
||||
#tabsList:before, #tabsList:after {content: none;}
|
||||
|
||||
#tabsList li {
|
||||
display: table-cell;
|
||||
height: auto;
|
||||
list-style-type: none;
|
||||
vertical-align: bottom;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
#tabsList > li {float: none;}
|
||||
|
||||
#tabsList > li.active > a, #tabsList > li.active > a:hover, #tabsList > li.active > a:focus {
|
||||
border-bottom-color: transparent;
|
||||
border: 2px solid #79C1FF;
|
||||
.tab {
|
||||
height:auto !important;
|
||||
}
|
||||
|
||||
@ -143,6 +143,11 @@ body {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.navbarUserButtons .btn:hover,
|
||||
.navbarSettingsButtons .btn:hover {
|
||||
background: #40434c;
|
||||
}
|
||||
|
||||
.panel-footer {padding: 0;}
|
||||
|
||||
.raiseHand {}
|
||||
@ -184,4 +189,4 @@ body {
|
||||
}
|
||||
|
||||
.videoFeedIcon {}
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user