Merge branch 'master' into develop

* master:
  Removes hard wired URL so that "New Room" works everywhere.
This commit is contained in:
Dan Seripap 2016-02-25 10:13:41 -05:00
commit 7ec18ef656

View File

@ -36,7 +36,7 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li><a href="https://darkwire.io/" target="_blank"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;New Room</a></li>
<li><a href="/" target="_blank"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;New Room</a></li>
<li><a href="javascript:void(0)" id="settings-nav"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span>&nbsp;Settings</a></li>
<li><a href="javascript:void(0)" id="about-nav"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>&nbsp;About</a></li>
</ul>
@ -126,7 +126,7 @@
<br>
<h6>Invite People to This Room</h6>
<p>
<input type="text" class="form-control share-text" readonly>
<input type="text" class="form-control share-text" readonly>
</p>
</div>
<div class="modal-footer">