Skip to content

Commit 3c8e6b6

Browse files
Phoenixyjaapmarcus
andauthored
Small fix for small screens in the logs header (hestiacp#4126)
* Update default.css Adding overflow-x:scroll; to the logs on smaller screens to fix the header, which goes out of the screen currently on mobile devices. * Run pretier format And fix CSS bug --------- Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
1 parent 2901b01 commit 3c8e6b6

File tree

6 files changed

+36
-31
lines changed

6 files changed

+36
-31
lines changed

func/rebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ rebuild_web_domain_conf() {
460460
done
461461

462462
# domain folder permissions: DOMAINDIR_WRITABLE: default-val:no source:hestia.conf
463-
DOMAINDIR_MODE=551
463+
DOMAINDIR_MODE=551
464464
if [ "$DOMAINDIR_WRITABLE" = 'yes' ]; then DOMAINDIR_MODE=751; fi
465465

466466
# Set folder permissions

func/syshealth.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ function syshealth_repair_system_config() {
538538
echo "[ ! ] Adding missing variable to hestia.conf: ROOT_USER ('admin')"
539539
$BIN/v-change-sys-config-value "ROOT_USER" "admin"
540540
fi
541-
if [[ -z $(check_key_exists 'DOMAINDIR_WRITABLE') ]]; then
541+
if [[ -z $(check_key_exists 'DOMAINDIR_WRITABLE') ]]; then
542542
echo "[ ! ] Adding missing variable to hestia.conf: DOMAINDIR_WRITABLE ('no')"
543543
$BIN/v-change-sys-config-value "DOMAINDIR_WRITABLE" "no"
544544
fi

install/common/firewall/ipset/blacklist.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
#
66

77
BLACKLISTS=(
8-
"https://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs
9-
"https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes
10-
"https://www.maxmind.com/en/high-risk-ip-sample-list" # MaxMind GeoIP Anonymous Proxies
11-
"https://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List
12-
"https://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP)
13-
"https://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List
14-
"https://lists.blocklist.de/lists/all.txt" # blocklist.de attackers
15-
"https://blocklist.greensnow.co/greensnow.txt" # GreenSnow
16-
"https://iplists.firehol.org/files/firehol_level1.netset" # Firehol Level 1
17-
"https://iplists.firehol.org/files/stopforumspam_7d.ipset" # Stopforumspam via Firehol
8+
"https://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs
9+
"https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes
10+
"https://www.maxmind.com/en/high-risk-ip-sample-list" # MaxMind GeoIP Anonymous Proxies
11+
"https://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List
12+
"https://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP)
13+
"https://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List
14+
"https://lists.blocklist.de/lists/all.txt" # blocklist.de attackers
15+
"https://blocklist.greensnow.co/greensnow.txt" # GreenSnow
16+
"https://iplists.firehol.org/files/firehol_level1.netset" # Firehol Level 1
17+
"https://iplists.firehol.org/files/stopforumspam_7d.ipset" # Stopforumspam via Firehol
1818
)
1919

2020
IP_BLACKLIST_TMP=$(mktemp)

install/upgrade/versions/1.8.8.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ hestia_conf="$HESTIA/conf/hestia.conf"
3030
hestia_defaults_conf="$HESTIA/conf/defaults/hestia.conf"
3131

3232
for i in POLICY_USER_CHANGE_THEME POLICY_USER_EDIT_WEB_TEMPLATES POLICY_USER_VIEW_LOGS; do
33-
if [[ -f "$hestia_conf" ]]; then
34-
if grep "$i" "$hestia_conf" | grep -q 'true'; then
35-
if "$BIN/v-change-sys-config-value" "$i" 'yes'; then
36-
echo "[ * ] Success: ${i} value changed from true to yes in hestia.conf"
37-
else
38-
echo "[ ! ] Error: Couldn't change ${i} value from true to yes in hestia.conf"
39-
fi
40-
fi
41-
fi
42-
if [[ -f "$hestia_defaults_conf" ]]; then
43-
if grep "$i" "$hestia_defaults_conf" | grep -q 'true'; then
44-
if sed -i "s/${i}='true'/${i}='yes'/" "$hestia_defaults_conf"; then
45-
echo "[ * ] Success: ${i} value changed from true to yes in defaults/hestia.conf"
46-
else
47-
echo "[ ! ] Error: Couldn't change ${i} value from true to yes in defaults/hestia.conf"
48-
fi
49-
fi
50-
fi
33+
if [[ -f "$hestia_conf" ]]; then
34+
if grep "$i" "$hestia_conf" | grep -q 'true'; then
35+
if "$BIN/v-change-sys-config-value" "$i" 'yes'; then
36+
echo "[ * ] Success: ${i} value changed from true to yes in hestia.conf"
37+
else
38+
echo "[ ! ] Error: Couldn't change ${i} value from true to yes in hestia.conf"
39+
fi
40+
fi
41+
fi
42+
if [[ -f "$hestia_defaults_conf" ]]; then
43+
if grep "$i" "$hestia_defaults_conf" | grep -q 'true'; then
44+
if sed -i "s/${i}='true'/${i}='yes'/" "$hestia_defaults_conf"; then
45+
echo "[ * ] Success: ${i} value changed from true to yes in defaults/hestia.conf"
46+
else
47+
echo "[ ! ] Error: Couldn't change ${i} value from true to yes in defaults/hestia.conf"
48+
fi
49+
fi
50+
fi
5151
done

web/css/src/themes/default.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2221,6 +2221,11 @@
22212221
font-size: 0.92rem;
22222222
line-height: 1.15;
22232223
padding-bottom: 20px;
2224+
overflow-x: scroll;
2225+
2226+
@media (--viewport-medium) {
2227+
overflow-x: initial;
2228+
}
22242229
}
22252230

22262231
/* Icon component

web/inc/main.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ function humanize_usage_size($usage, $round = 2) {
354354
}
355355
if ($usage < 1) {
356356
$usage = "0";
357-
}
357+
}
358358
$display_usage = $usage;
359359
if ($usage > 1024) {
360360
$usage = $usage / 1024;

0 commit comments

Comments
 (0)