Merge remote-tracking branch 'upstream/master' into call-manager

This commit is contained in:
Matthew Marangoni 2017-07-25 08:44:45 -07:00
commit 4b8704ad08
2 changed files with 3 additions and 3 deletions

View File

@ -49,7 +49,7 @@ input {
margin-bottom: 40px;
}
.join-metting {
.join-meeting {
background: #EDF4FB;
padding: 60px;
text-align: center;
@ -59,7 +59,7 @@ input {
border-radius: 5px;
}
.join-metting .button {
.join-meeting .button {
margin-bottom:20px;
}

View File

@ -56,7 +56,7 @@
</div>
<div class="span one"></div>
<div class='span six'>
<div class='join-metting pull-right'>
<div class='join-meeting pull-right'>
<h4>Try BigBlueButton</h4>
<p>Join a demo session on this server.</p>