Fix merge error

This commit is contained in:
OfficialNoob
2019-08-13 22:14:45 +01:00
7 changed files with 290 additions and 38 deletions

View File

@@ -114,6 +114,31 @@
</div>
<div id="setUsernameContainer" class="popupElement">
<br/>
<br/>
<button id="setUsernameButton" class="warningButton popupElement">Set Username</button>
</div>
<div id="setUsername" class="popupElement" style="display: none">
<br/>
<h3>Set Username</h3>
<div id="setUsernameStatusContainer" style="display: none">
<h2 id="setUsernameStatus"></h2>
</div>
<input id="usernameInput" hint="Username"></input>
<br/>
<br/>
<button id="submitUsername" class="warningButton popupElement">Submit Username</button>
</div>
<div id="discordButtonContainer" class="popupElement" style="display: none">
<br/>
@@ -121,7 +146,7 @@
<br/>
Come join the official discord server to give suggestions and feedback!
Come join the official discord server to give suggestions and feedback!
<br/>