Skip to content

Commit 678c4ee

Browse files
authored
Fixes and updates (hestiacp#3152)
1 parent d693c25 commit 678c4ee

35 files changed

+132
-205
lines changed

docs/docs/introduction/best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Best Practices
22

3-
Managing a server is not easy. Here are a couple of best practices you should try to adhere to while managing your Hestia server.
3+
Managing a server is not easy. Here are some best practices you should try to adhere to while managing your Hestia server.
44

55
## Use a regular user
66

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ hero:
2525
features:
2626
- icon: 🚀
2727
title: Fast & easy to learn
28-
details: Hestia is made with ease of use in mind. Creating a user or a website is as easy as clicking a button and filling up a couple of fields, while advanced features are easily accessible.
28+
details: Hestia is made with ease of use in mind. Creating a user or a website is as easy as clicking a button and filling out a couple of fields, while advanced features are easily accessible.
2929
link: /docs/introduction/getting-started
3030
linkText: Documentation
3131
- icon: ❤️
@@ -40,7 +40,7 @@ features:
4040
linkText: Help develop Hestia
4141
- icon: 🤝
4242
title: Supported by the community
43-
details: Hestia has a great support community, join the forum or the Discord server! To keep the project running, we rely on donations, which can be done via PayPal or cryptocurrency.
43+
details: Hestia has a great support community - join the forum or the Discord server! To keep the project running, we rely on donations, which can be made via PayPal or cryptocurrency.
4444
link: /donate
4545
linkText: Donate
4646
---

web/css/src/themes/dark.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,6 @@ strong {
375375
.units > div:last-child {
376376
}
377377

378-
.l-unit-ft {
379-
color: #cdcdcd;
380-
}
381-
382378
.l-unit:hover .l-unit-toolbar__col--right {
383379
}
384380

@@ -909,6 +905,7 @@ form#vstobjects.suspended {
909905
}
910906

911907
.app-footer {
908+
color: #cdcdcd;
912909
border-color: #454545;
913910
}
914911

web/css/src/themes/default.css

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@
250250

251251
.top-bar-notification-delete {
252252
display: none;
253+
background-color: transparent;
254+
border: 0;
253255
padding-left: 5px;
254256
padding-right: 5px;
255257

@@ -263,8 +265,12 @@
263265
}
264266
}
265267

266-
.top-bar-notification-mark-all {
268+
.top-bar-notification-delete-all {
267269
display: block;
270+
background-color: transparent;
271+
border: 0;
272+
color: inherit;
273+
width: 100%;
268274
text-align: center;
269275
padding: 10px 15px;
270276

@@ -1011,11 +1017,6 @@
10111017
border-bottom: none;
10121018
}
10131019

1014-
.l-unit-ft {
1015-
color: #7c7c7c;
1016-
padding: 0 0 0 15px;
1017-
}
1018-
10191020
.l-unit:hover .l-unit-toolbar__col--right {
10201021
display: block;
10211022
}
@@ -1132,10 +1133,6 @@
11321133
padding-left: 16px;
11331134
}
11341135

1135-
.l-unit__col--right.back {
1136-
padding-left: 78px;
1137-
}
1138-
11391136
.l-unit__suspended {
11401137
display: none;
11411138
font-size: 0.8rem;
@@ -2475,10 +2472,21 @@ form#vstobjects.suspended {
24752472
}
24762473

24772474
.app-footer {
2475+
color: #7c7c7c;
24782476
border-top: 1px solid #ddd;
24792477
font-size: 0.8rem;
2480-
padding-top: 30px;
2481-
padding-bottom: 30px;
2478+
padding-top: 20px;
2479+
padding-bottom: 20px;
2480+
2481+
@media (--viewport-medium) {
2482+
padding-top: 40px;
2483+
padding-bottom: 40px;
2484+
}
2485+
}
2486+
2487+
.app-footer-inner {
2488+
padding-left: 15px;
2489+
padding-right: 15px;
24822490
}
24832491

24842492
/* Collapse component

web/css/themes/dark.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/css/themes/default.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/js/main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ function randomString(length = 16) {
114114
}
115115

116116
document.addEventListener('alpine:init', () => {
117-
const token = document.querySelector('#token').getAttribute('token');
118-
119117
// Sticky class helper
120118
window.addEventListener('scroll', () => {
121119
const toolbar = document.querySelector('.toolbar');
@@ -188,6 +186,7 @@ document.addEventListener('alpine:init', () => {
188186
}
189187
},
190188
async list() {
189+
const token = document.querySelector('#token').getAttribute('token');
191190
const res = await fetch(`/list/notifications/?ajax=1&token=${token}`);
192191
this.initialized = true;
193192
if (!res.ok) {
@@ -200,6 +199,7 @@ document.addEventListener('alpine:init', () => {
200199
);
201200
},
202201
async remove(id) {
202+
const token = document.querySelector('#token').getAttribute('token');
203203
await fetch(`/delete/notification/?delete=1&notification_id=${id}&token=${token}`);
204204

205205
this.notifications = this.notifications.filter((notification) => notification.ID != id);
@@ -208,6 +208,7 @@ document.addEventListener('alpine:init', () => {
208208
}
209209
},
210210
async removeAll() {
211+
const token = document.querySelector('#token').getAttribute('token');
211212
await fetch(`/delete/notification/?delete=1&token=${token}`);
212213

213214
this.notifications = [];

web/templates/includes/panel.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ class="top-bar-notification-item"
8585
>
8686
<div class="top-bar-notification-header">
8787
<p x-text="notification.TOPIC" class="top-bar-notification-title"></p>
88-
<a
88+
<button
8989
x-on:click="remove(notification.ID)"
90-
href="#"
90+
type="button"
9191
class="top-bar-notification-delete"
9292
>
9393
<i class="fas fa-xmark"></i>
94-
</a>
94+
</button>
9595
</div>
9696
<div x-html="notification.NOTICE"></div>
9797
<p
@@ -102,14 +102,14 @@ class="top-bar-notification-timestamp"
102102
</template>
103103
<template x-if="initialized && notifications.length > 2">
104104
<li>
105-
<a
105+
<button
106106
x-on:click="removeAll()"
107-
href="#"
108-
class="top-bar-notification-mark-all"
107+
type="button"
108+
class="top-bar-notification-delete-all"
109109
>
110110
<i class="fas fa-check"></i>
111111
<?= _("Delete all notifications") ?>
112-
</a>
112+
</button>
113113
</li>
114114
</template>
115115
</ul>

web/templates/pages/list_access_keys.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,9 @@
9898
</div>
9999

100100
<footer class="app-footer">
101-
<div class="container">
102-
<div class="l-unit-ft">
103-
<div class="l-unit__col l-unit__col--right">
104-
<?php printf(ngettext("%d Access Key", "%d Access Keys", $i), $i); ?>
105-
</div>
106-
</div>
101+
<div class="container app-footer-inner">
102+
<p>
103+
<?php printf(ngettext("%d Access Key", "%d Access Keys", $i), $i); ?>
104+
</p>
107105
</div>
108106
</footer>

web/templates/pages/list_backup.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@
121121
</div>
122122

123123
<footer class="app-footer">
124-
<div class="container">
125-
<div class="l-unit-ft">
126-
<div class="l-unit__col l-unit__col--right">
127-
<?php printf(ngettext("%d backup", "%d backups", $i), $i); ?>
128-
</div>
129-
</div>
124+
<div class="container app-footer-inner">
125+
<p>
126+
<?php printf(ngettext("%d backup", "%d backups", $i), $i); ?>
127+
</p>
130128
</div>
131129
</footer>

0 commit comments

Comments
 (0)