Skip to content

Commit 0a025fe

Browse files
authored
Minor UI updates (hestiacp#3322)
* Tidy some CSS * Use valid password in dev instructions * Refine button styles, remove .u-mr30 utility * Tidy button CSS * Bump vitepress
1 parent 2d66a47 commit 0a025fe

File tree

16 files changed

+223
-281
lines changed

16 files changed

+223
-281
lines changed

docs/docs/contributing/development.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ multipass mount $HOME/projects/hestiacp hestia-dev:/home/ubuntu/hestiacp
6464

6565
```bash
6666
cd ../install
67-
bash hst-install-ubuntu.sh -D /tmp/hestiacp-src/deb/ --interactive no --email admin@example.com --password password123 --hostname demo.hestiacp.com -f
67+
bash hst-install-ubuntu.sh -D /tmp/hestiacp-src/deb/ --interactive no --email admin@example.com --password Password123 --hostname demo.hestiacp.com -f
6868
```
6969

7070
1. Reboot VM (and exit SSH session)
@@ -79,7 +79,7 @@ multipass mount $HOME/projects/hestiacp hestia-dev:/home/ubuntu/hestiacp
7979
multipass list
8080
```
8181

82-
1. Visit the VM's IP address in your browser using the default Hestia port and login with `admin`/`password123`
82+
1. Visit the VM's IP address in your browser using the default Hestia port and login with `admin`/`Password123`
8383

8484
_(bypass any SSL errors you see when loading the page)_
8585

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"stylelint": "^15.2.0",
4646
"stylelint-config-standard": "^30.0.1",
4747
"typescript": "^4.9.5",
48-
"vitepress": "1.0.0-alpha.48",
48+
"vitepress": "1.0.0-alpha.49",
4949
"vue": "^3.2.47"
5050
}
5151
}

web/css/src/themes/dark.css

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,6 @@ strong {
347347
color: #fff;
348348
}
349349

350-
.l-unit {
351-
color: #dadada;
352-
}
353-
354350
.table-header {
355351
background: #404040;
356352
border-left: 1px solid #212121;
@@ -363,6 +359,10 @@ strong {
363359
box-shadow: inset 0 1px 1px rgb(0 0 0 / 30%);
364360
}
365361

362+
.l-unit {
363+
color: #dadada;
364+
}
365+
366366
.units .l-unit {
367367
background-color: #303030;
368368
border-bottom: 1px solid #282828;
@@ -589,7 +589,6 @@ strong {
589589
background-color: #454545;
590590
box-shadow: 0 1px 3px rgb(0 0 0 / 35%), inset 0 0 1px rgb(0 0 0 / 100%),
591591
inset 0 0 3px rgb(0 0 0 / 65%);
592-
transition: 0.2s;
593592
}
594593

595594
&:active,

web/css/src/themes/default.css

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,8 @@
788788
min-width: 0;
789789
width: 100%;
790790
margin-bottom: 5px;
791-
padding: 2px 10px;
791+
padding-left: 10px;
792+
padding-right: 10px;
792793

793794
&:last-child {
794795
margin-bottom: 0;
@@ -891,21 +892,13 @@
891892
font-weight: 600;
892893
}
893894

894-
.body-user .l-unit.animate__animated.animate__fadeIn {
895-
line-height: 2rem;
896-
}
897-
898-
.body-user .actions-panel {
899-
line-height: 2rem;
900-
}
895+
/* Improve alignment of "Users" list double-height rows */
901896

902-
.l-unit {
903-
color: #707070;
904-
padding-left: 15px;
905-
overflow: hidden;
906-
font-size: 0.8rem;
907-
border-left: 1px solid transparent;
908-
border-right: 1px solid transparent;
897+
.body-user {
898+
& .l-unit.animate__animated.animate__fadeIn,
899+
& .actions-panel {
900+
line-height: 2rem;
901+
}
909902
}
910903

911904
.table-header {
@@ -944,6 +937,15 @@
944937
}
945938
}
946939

940+
.l-unit {
941+
color: #707070;
942+
padding-left: 15px;
943+
overflow: hidden;
944+
font-size: 0.8rem;
945+
border-left: 1px solid transparent;
946+
border-right: 1px solid transparent;
947+
}
948+
947949
.units .l-unit {
948950
border-bottom: 1px solid #ddd;
949951
border-left: 1px solid transparent;
@@ -1832,7 +1834,7 @@
18321834
.button {
18331835
cursor: pointer;
18341836
display: inline-block;
1835-
line-height: 1.5;
1837+
line-height: 21px;
18361838
font-size: 0.85rem;
18371839
font-weight: 500;
18381840
padding: 3px 25px;
@@ -2144,6 +2146,7 @@
21442146
@media (--viewport-medium) {
21452147
display: flex;
21462148
align-items: flex-end;
2149+
gap: 30px;
21472150
max-width: 500px;
21482151

21492152
& form {
@@ -2192,12 +2195,12 @@
21922195
visibility: hidden;
21932196
opacity: 0;
21942197
transition: opacity 0.2s ease, visibility 0s 0.2s;
2195-
}
21962198

2197-
.fullscreen-loader.show {
2198-
visibility: visible;
2199-
opacity: 1;
2200-
transition: opacity 0.2s ease, visibility 0s 0s;
2199+
&.show {
2200+
visibility: visible;
2201+
opacity: 1;
2202+
transition: opacity 0.2s ease, visibility 0s 0s;
2203+
}
22012204
}
22022205

22032206
.qr-code {

web/css/src/utilities.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@
8181
margin-right: 15px !important;
8282
}
8383

84-
.u-mr30 {
85-
margin-right: 30px !important;
86-
}
87-
8884
.u-mb5 {
8985
margin-bottom: 5px !important;
9086
}

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: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/templates/pages/login/login.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="login animate__animated animate__zoomIn">
2-
<a href="/" class="u-block u-mr30 u-mb40">
2+
<a href="/" class="u-block u-mb40">
33
<img src="/images/logo.svg" alt="<?= _("Hestia Control Panel") ?>" width="100" height="120">
44
</a>
55
<form id="form_login" method="post" action="/login/">

web/templates/pages/login/login_1.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="login animate__animated animate__zoomIn">
2-
<a href="/" class="u-block u-mr30 u-mb40">
2+
<a href="/" class="u-block u-mb40">
33
<img src="/images/logo.svg" alt="<?= _("Hestia Control Panel") ?>" width="100" height="120">
44
</a>
55
<form id="form_login" method="post" action="/login/">

web/templates/pages/login/login_2.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="login animate__animated animate__zoomIn">
2-
<a href="/" class="u-block u-mr30 u-mb40">
2+
<a href="/" class="u-block u-mb40">
33
<img src="/images/logo.svg" alt="<?= _("Hestia Control Panel") ?>" width="100" height="120">
44
</a>
55
<form id="form_login" method="post" action="/login/">

0 commit comments

Comments
 (0)