Fix bad merge

This commit is contained in:
rxdn 2021-01-08 20:39:19 +00:00
parent 67df6b2bda
commit 09484e370d
2 changed files with 34 additions and 21 deletions

View File

@ -4,10 +4,15 @@
{{template "head" .}} {{template "head" .}}
</head> </head>
<body> <body>
{{template "sidebar" .}} <div class="wrapper">
<!--{{template "loadingscreen" .}} {{template "sidebar" .}}
<script src="/assets/js/modalbackdrop.js"></script> {{template "sidebar" .}}
{{template "notifymodal" .}} <div class="main-panel">
{{template "content" .}}--> {{template "loadingscreen" .}}
<script src="/assets/js/modalbackdrop.js"></script>
{{template "notifymodal" .}}
{{template "content" .}}
</div>
</div>
</body> </body>
</html> </html>

View File

@ -1,21 +1,29 @@
{{define "content"}} {{define "content"}}
<div class="card"> <div class="content">
<div class="card-header"> <div class="container-fluid">
<h4 class="card-title">Servers</h4> <div class="row">
</div> <div class="col-md-12">
<div class="card-body" id="card"> <div class="card">
<div class="card-body table-responsive"> <div class="card-header">
<div class="flex-container" id="guild-container"> <h4 class="card-title">Servers</h4>
<div class="guild" onclick="invite();" id="invite-container"> </div>
<i class="fas fa-plus fa-2x guild-icon-fa"></i> <div class="card-body" id="card">
<span class="guild-name">Invite to your server</span> <div class="card-body table-responsive">
</div> <div class="flex-container" id="guild-container">
</div> <div class="guild" onclick="invite();" id="invite-container">
<i class="fas fa-plus fa-2x guild-icon-fa"></i>
<span class="guild-name">Invite to your server</span>
</div>
</div>
<div class="flex-container" id="refresh-container"> <div class="flex-container" id="refresh-container">
<button class="btn btn-primary btn-fill" onclick="refreshGuilds()"> <button class="btn btn-primary btn-fill" onclick="refreshGuilds()">
<i class="fas fa-sync"></i> Refresh list <i class="fas fa-sync"></i> Refresh list
</button> </button>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>