Fix bad merge
This commit is contained in:
parent
67df6b2bda
commit
09484e370d
@ -4,10 +4,15 @@
|
||||
{{template "head" .}}
|
||||
</head>
|
||||
<body>
|
||||
{{template "sidebar" .}}
|
||||
<!--{{template "loadingscreen" .}}
|
||||
<script src="/assets/js/modalbackdrop.js"></script>
|
||||
{{template "notifymodal" .}}
|
||||
{{template "content" .}}-->
|
||||
<div class="wrapper">
|
||||
{{template "sidebar" .}}
|
||||
{{template "sidebar" .}}
|
||||
<div class="main-panel">
|
||||
{{template "loadingscreen" .}}
|
||||
<script src="/assets/js/modalbackdrop.js"></script>
|
||||
{{template "notifymodal" .}}
|
||||
{{template "content" .}}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
@ -1,21 +1,29 @@
|
||||
{{define "content"}}
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h4 class="card-title">Servers</h4>
|
||||
</div>
|
||||
<div class="card-body" id="card">
|
||||
<div class="card-body table-responsive">
|
||||
<div class="flex-container" id="guild-container">
|
||||
<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="content">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h4 class="card-title">Servers</h4>
|
||||
</div>
|
||||
<div class="card-body" id="card">
|
||||
<div class="card-body table-responsive">
|
||||
<div class="flex-container" id="guild-container">
|
||||
<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">
|
||||
<button class="btn btn-primary btn-fill" onclick="refreshGuilds()">
|
||||
<i class="fas fa-sync"></i> Refresh list
|
||||
</button>
|
||||
<div class="flex-container" id="refresh-container">
|
||||
<button class="btn btn-primary btn-fill" onclick="refreshGuilds()">
|
||||
<i class="fas fa-sync"></i> Refresh list
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
Loading…
x
Reference in New Issue
Block a user