Skip to content

Commit 3813d17

Browse files
authored
Remove more tables (hestiacp#3114)
1 parent a6da006 commit 3813d17

File tree

18 files changed

+703
-647
lines changed

18 files changed

+703
-647
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@
1616

1717
## Development Guidelines
1818

19+
Additional information on how to contribute to Hestia Control Panel can be found in the [Development](docs/docs/contributing/development.md) documentation.
20+
1921
### Code formatting and comments
2022

2123
We ask that you follow existing naming schemes and coding conventions where possible, and that you add comments in your source code where appropriate to aid other developers in debugging and understanding your code in the future.
2224

25+
To ensure your changes meet our formatting requirements, please run `yarn install` from the root of the repository before committing your changes. This will set up pre-commit hooks for automatic formatting, which will help to get your changes merged as quickly as possible.
26+
2327
### Workflow and process
2428

2529
Development for this project takes place in branches to effectively develop, manage, and test new features and code changes. Our tiered approach allows us to closely control the quality of code as it is checked in for inclusion.

docs/docs/contributing/development.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
Hestia is an open-source project, and we welcome contributions from the community. Please read the [contributing guidelines](https://github.com/hestiacp/hestiacp/blob/main/CONTRIBUTING.md) for additional information.
44

5-
Hestia is designed to run on a web server. To develop Hestia locally, we recommend using a virtual machine.
5+
Hestia is designed to be installed on a web server. To develop Hestia on your local machine, a virtual machine is recommend.
66

77
::: warning
88
Development builds are unstable. If you encounter a bug please [report it via GitHub](https://github.com/hestiacp/hestiacp/issues/new/choose) or [submit a Pull request](https://github.com/hestiacp/hestiacp/pulls).
99
:::
1010

11-
## Running Hestia in a virtual machine
11+
## Creating a virtual machine for development
1212

13-
Here are example instructions for running Hestia for development in a virtual machine.
13+
These are example instructions for creating a virtual machine running Hestia for development.
1414

1515
These instructions use [Multipass](https://multipass.run/) to create the VM. Feel free to adapt the commands for any virtualization software you prefer.
1616

@@ -69,13 +69,15 @@ These instructions use [Multipass](https://multipass.run/) to create the VM. Fee
6969
multipass list
7070
```
7171

72-
1. Visit the VM's IP address in your browser using the default Hestia port, bypass any SSL warnings and login with `admin`/`password123`
72+
1. Visit the VM's IP address in your browser using the default Hestia port and login with `admin`/`password123`
73+
74+
_(bypass any SSL errors you see when loading the page)_
7375

7476
```bash
7577
e.g. https://192.168.64.15:8083
7678
```
7779

78-
You now have Hestia running in a virtual machine. The following section will cover how to make changes to Hestia and test them locally.
80+
Hestia is now running in a virtual machine. If you'd like to make changes to the source code and test them, please continue to the next section.
7981

8082
## Making changes to Hestia
8183

web/css/src/base.css

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,44 @@ body {
3636
}
3737

3838
a {
39-
color: var(--color-text);
39+
color: var(--color-text-link);
4040
text-decoration: none;
41+
42+
&:hover {
43+
color: var(--color-text-link-hover);
44+
}
45+
}
46+
47+
p,
48+
pre {
49+
margin: 0;
4150
}
4251

4352
h1,
53+
.u-text-H1,
4454
h2,
55+
.u-text-H2,
4556
h3,
46-
p,
47-
pre {
57+
.u-text-H3 {
58+
font-weight: 500;
4859
margin: 0;
4960
}
5061

62+
h1,
63+
.u-text-H1 {
64+
font-size: 1.4rem;
65+
}
66+
67+
h2,
68+
.u-text-H2 {
69+
font-size: 1.2rem;
70+
}
71+
72+
h3,
73+
.u-text-H3 {
74+
font-size: 1rem;
75+
}
76+
5177
ol,
5278
ul {
5379
list-style: none;

web/css/src/themes/dark.css

Lines changed: 62 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88

99
:root {
1010
--color-text: #cdcdcd;
11+
--color-text-link: #52b9ff;
12+
--color-text-link-hover: #ff3478;
1113
--color-background: #282828;
1214
--alert-border-color: #212121;
15+
16+
/* Alerts */
17+
--alert-danger-color: #d13535;
1318
}
1419

1520
b,
@@ -180,14 +185,22 @@ strong {
180185
}
181186
}
182187

183-
/* Alerts
188+
/* Inline alerts
184189
========================================================================== */
185190

186-
.alert-danger {
187-
background-color: #d13535;
191+
.inline-danger {
192+
color: #f33;
193+
}
194+
195+
.inline-success {
196+
color: #53ba55;
188197

189-
& .fas {
190-
color: #d13535;
198+
& a {
199+
color: #fff;
200+
201+
&:hover {
202+
color: #ff3478;
203+
}
191204
}
192205
}
193206

@@ -206,6 +219,9 @@ strong {
206219
color: #fafafa;
207220
}
208221

222+
/* Toolbar
223+
========================================================================== */
224+
209225
.toolbar {
210226
border-color: #454545;
211227
background-color: #282828;
@@ -463,22 +479,11 @@ strong {
463479
color: #fff;
464480
}
465481

466-
/* form styles */
467-
468-
.inline-danger {
469-
color: #f33;
470-
}
471-
472-
.inline-success {
473-
color: #53ba55;
474-
475-
& a {
476-
color: #fff;
482+
/* Forms
483+
========================================================================== */
477484

478-
&:hover {
479-
color: #ff3478;
480-
}
481-
}
485+
.form-title {
486+
color: #e8e8e8;
482487
}
483488

484489
.form-label,
@@ -565,9 +570,6 @@ textarea:focus::placeholder {
565570
color: #909090;
566571
}
567572

568-
.lets-encrypt-note {
569-
}
570-
571573
.toggle-psw-visibility-icon {
572574
}
573575

@@ -696,50 +698,13 @@ textarea:focus::placeholder {
696698
.optional {
697699
}
698700

699-
.mail-infoblock {
700-
color: #fff;
701-
border: 1px solid #606060;
702-
box-shadow: 0 1px 4px rgb(0 0 0 / 35%);
703-
background-color: #454545;
704-
}
705-
706-
.mail-infoblock:hover {
707-
}
708-
709-
.mail-infoblock td {
710-
color: #dadada;
711-
}
712-
713-
.mail-infoblock td:first-child {
714-
}
715-
716-
.mail-infoblock div {
717-
}
718-
719-
.mail-infoblock a {
720-
color: #52b9ff;
721-
722-
&:hover {
723-
color: #ff3478;
724-
}
725-
}
726-
727-
.additional-info {
728-
}
729-
730-
.additional-info td {
731-
}
732-
733-
.additional-info td.details {
734-
}
735-
736701
.body-login,
737702
.body-reset {
738703
background: #303030;
739704
background: radial-gradient(circle, rgb(77 77 77 / 100%) 0%, rgb(31 31 31 / 100%) 100%);
740705
}
741706

742-
/* Login box
707+
/* Login
743708
========================================================================== */
744709

745710
.login {
@@ -771,10 +736,6 @@ textarea:focus::placeholder {
771736
}
772737
}
773738

774-
.form-title {
775-
color: #e8e8e8;
776-
}
777-
778739
.section-title {
779740
color: #d4d4d4;
780741
border-bottom-color: #484848;
@@ -926,6 +887,9 @@ form#vstobjects.suspended {
926887
text-shadow: 0 !important;
927888
}
928889

890+
/* Modals
891+
========================================================================== */
892+
929893
.ui-dialog .ui-dialog-buttonpane {
930894
border-top: 1px solid #404040;
931895
}
@@ -934,16 +898,6 @@ form#vstobjects.suspended {
934898
box-shadow: 0 1px 4px rgb(0 0 0 / 10%), inset 0 0 1px #000, inset 0 0 3px rgb(0 0 0 / 50%);
935899
}
936900

937-
.shortcuts {
938-
background: rgb(30 30 30 / 95%);
939-
border: 1px solid rgb(255 255 255 / 25%);
940-
box-shadow: 0 0 20px rgb(0 0 0 / 50%);
941-
}
942-
943-
.shortcuts-header {
944-
border-bottom: 1px solid #353535;
945-
}
946-
947901
.ui-dialog {
948902
background-color: rgb(45 45 45 / 95%);
949903
border: 1px solid rgb(80 80 80 / 97%);
@@ -959,6 +913,23 @@ form#vstobjects.suspended {
959913
font-weight: 600;
960914
}
961915

916+
.ui-widget-header a {
917+
color: #cacaca !important;
918+
}
919+
920+
/* Shortcuts panel
921+
========================================================================== */
922+
923+
.shortcuts {
924+
background: rgb(30 30 30 / 95%);
925+
border: 1px solid rgb(255 255 255 / 25%);
926+
box-shadow: 0 0 20px rgb(0 0 0 / 50%);
927+
}
928+
929+
.shortcuts-header {
930+
border-bottom: 1px solid #353535;
931+
}
932+
962933
.helper-container {
963934
box-shadow: 0 1px 4px rgb(0 0 0 / 25%);
964935
border: 1px solid #606060;
@@ -1002,14 +973,6 @@ li[aria-expanded="true"] a {
1002973
color: #707070;
1003974
}
1004975

1005-
.ui-widget-header a {
1006-
color: #cacaca !important;
1007-
}
1008-
1009-
.debug-panel-content {
1010-
background-color: #282828;
1011-
}
1012-
1013976
.body-rrd .units .l-unit {
1014977
background-color: #282828 !important;
1015978
border-left: 1px solid transparent !important;
@@ -1050,6 +1013,15 @@ li[aria-expanded="true"] a {
10501013
border-color: #454545;
10511014
}
10521015

1016+
/* Panel component
1017+
========================================================================== */
1018+
1019+
.panel {
1020+
background-color: #454545;
1021+
border-color: #606060;
1022+
box-shadow: 0 1px 4px rgb(0 0 0 / 35%);
1023+
}
1024+
10531025
/* Collapse component
10541026
========================================================================== */
10551027

@@ -1060,3 +1032,10 @@ li[aria-expanded="true"] a {
10601032
box-shadow: inset 0 0 2px rgb(0 0 0 / 50%), 0 2px 6px rgb(0 0 0 / 40%);
10611033
color: #fff;
10621034
}
1035+
1036+
/* Debug panel
1037+
========================================================================== */
1038+
1039+
.debug-panel-content {
1040+
background-color: #282828;
1041+
}

0 commit comments

Comments
 (0)