Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: CSS3 variables & improved CSS dev experience #1748

Draft
wants to merge 99 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
863e92f
feat: convert colours to CSS3 variables
BaileyJM02 Sep 9, 2023
37be7e9
example: format file
BaileyJM02 Sep 9, 2023
5551118
example: format file
BaileyJM02 Sep 9, 2023
6fb2b81
chore: reformat to old layout
BaileyJM02 Sep 9, 2023
37f79d2
chore: format colour vars
BaileyJM02 Sep 9, 2023
9df2266
chore: remove example file
BaileyJM02 Sep 9, 2023
5d9ed16
chore: pad with zeros to make comments more readable
BaileyJM02 Sep 9, 2023
2e63915
fix: correct usage bar
BaileyJM02 Sep 9, 2023
15d7e5c
feat: add contextual colours
BaileyJM02 Sep 11, 2023
92f3119
chore: move to HEX codes
BaileyJM02 Sep 11, 2023
5ca1cc1
chore: format default black theme
BaileyJM02 Sep 11, 2023
5dfc79e
feat: split theme files
BaileyJM02 Sep 11, 2023
20d06e8
feat: import CSS files
BaileyJM02 Sep 11, 2023
5c25e9b
fix: correct color profiles
BaileyJM02 Sep 12, 2023
b62fe10
fix: add `header-color`
BaileyJM02 Sep 12, 2023
97e81a2
chore: catch up base for black & white themes css w/ master
zackspear May 30, 2024
1568014
feat: css nesting for sidebar layout in default-base.css
zackspear May 30, 2024
8bf3b89
refactor: html theme classes
zackspear May 30, 2024
b76aadc
chore: gray theme clean comment
zackspear May 30, 2024
02b8e8a
feat: css vars for dynamix css
zackspear May 31, 2024
9a876cb
fix: boot styles w/ css vars files
zackspear May 31, 2024
c674662
refactor: dynamix themes remove non-unique css vars
zackspear May 31, 2024
87b5343
refactor: move defaultpagelayout.css rules into default-base.css
zackspear May 31, 2024
314aeb7
fix: remove php in page css file
zackspear May 31, 2024
d947985
chore: page css format with prettier
zackspear May 31, 2024
feeb617
refactor: Browse page css variables
zackspear May 31, 2024
6b8f926
refactor: BrowseButton page css variables
zackspear May 31, 2024
e3dee2c
refactor: DashStats page css variables
zackspear May 31, 2024
866a6a6
refactor: Disk page css clean up
zackspear May 31, 2024
feb92bb
refactor: Flash page css clean up duplicates
zackspear May 31, 2024
154f978
refactor: Language page css clean up duplicates
zackspear May 31, 2024
3810938
refactor: NetworkExtra page css clean up duplicates
zackspear May 31, 2024
5fe32e4
refactor: NetworkRules page css clean up duplicates
zackspear May 31, 2024
64b8180
refactor: RoutingTables page css clean up duplicates
zackspear May 31, 2024
9a4dd16
refactor: Share page css clean up duplicates
zackspear May 31, 2024
48a18ed
refactor: ShareEdit page css clean up duplicates
zackspear May 31, 2024
ae0334f
refactor: Syslinux page css clean up duplicates
zackspear May 31, 2024
1ec6db8
refactor: UserAdd page css clean up duplicates
zackspear May 31, 2024
c31375e
refactor: UserEdit page css clean up duplicates
zackspear May 31, 2024
a3c4da8
refactor: UserList page css clean up duplicates
zackspear May 31, 2024
cb20781
refactor: WG0 page css clean up duplicates
zackspear May 31, 2024
954f1f9
fix: swal p tag text align
zackspear Jun 3, 2024
e69f318
feat: button and input css vars
zackspear Jun 3, 2024
16dc2c0
refactor: base theme css var config
zackspear Jun 4, 2024
c56de31
refactor: base dynamix css var config
zackspear Jun 4, 2024
d185a6b
refactor: azure dynamix css var config
zackspear Jun 4, 2024
3321c99
chore: css var comments
zackspear Jun 4, 2024
7dae7fc
chore: gitignore prettier
zackspear Jun 4, 2024
b8bf0fe
fix: table color contrast
zackspear Jun 25, 2024
cea30ed
fix: table row hover contrast
zackspear Jun 25, 2024
4c7f736
fix: table header bg
zackspear Jun 25, 2024
b0a5146
fix: disk usage bar colors
zackspear Jun 26, 2024
9f2098b
chore: remove css @todo comment
zackspear Jun 26, 2024
2c7cf71
refactor: apcupsd UPSsettings css format
zackspear Jun 26, 2024
93af45e
refactor: docker.manager css format
zackspear Jun 26, 2024
902f8b4
refactor: docker.manager AddContainer css vars
zackspear Jun 27, 2024
8d7739a
refactor: docker.manager DockerSettings css vars
zackspear Jun 27, 2024
b45fa8c
refactor: docker.manager DockerSettings css vars
zackspear Jun 27, 2024
925c13a
refactor: docker.manager UpdateContainer css vars
zackspear Jun 27, 2024
ea253fa
refactor: docker.gui_search css vars
zackspear Jun 27, 2024
30ecc5c
refactor: docker.plugin.manager css format
zackspear Jun 27, 2024
b2214d7
refactor: docker.plugin.manager PluginHelpers css format
zackspear Jun 27, 2024
f4195c6
refactor: docker.plugin.manager Update css condense files
zackspear Jun 27, 2024
f77d782
refactor: docker.vm.manager css format
zackspear Jun 27, 2024
2952db2
refactor: docker.vm.manager VMTemplates css vars
zackspear Jun 27, 2024
30515ea
refactor: docker.vm.manager VMSettings css vars
zackspear Jun 27, 2024
3e9ff06
refactor: docker.vm.manager VMSettings css vars
zackspear Jun 27, 2024
c61db31
refactor: docker.vm.manager VMSettings css var name
zackspear Jun 27, 2024
651851b
refactor: docker.vm.manager VMMachines css vars
zackspear Jun 27, 2024
4217ce7
refactor: docker.vm.manager UpdateVM css vars
zackspear Jun 27, 2024
b739c01
refactor: docker.vm.manager AddVM css vars
zackspear Jun 27, 2024
b0ddf7f
refactor: default css vars condensed
zackspear Jun 27, 2024
f5c7741
refactor: eth0 css vars
zackspear Jun 27, 2024
ac297a3
refactor: Language css vars
zackspear Jun 27, 2024
f8e2acc
refactor: ShareEdit css vars
zackspear Jun 27, 2024
5f2f510
fix: language page remove language js function
zackspear Jun 27, 2024
6bffb0e
refactor: WG0 css vars
zackspear Jun 27, 2024
8250a1c
chore: css vars comments
zackspear Jun 28, 2024
c799afb
refactor: UserEdit css vars
zackspear Jun 28, 2024
790aec0
refactor: docker.vm.manager theme css format
zackspear Jun 28, 2024
2a005f0
refactor: DockerManager default css with vars
zackspear Jul 1, 2024
6d727f0
fix: remove temp dev theme switcher
zackspear Jul 1, 2024
e66796b
fix: usage bar azure & white
zackspear Jul 2, 2024
aa2c09a
fix: title header background css var
zackspear Jul 2, 2024
fde4895
chore: css white comment cleanup
zackspear Jul 2, 2024
6f42624
refactor: theme specific colors var usage
zackspear Jul 2, 2024
27882e5
feat: reduce css files for theme css vars
zackspear Jul 2, 2024
af5f08e
chore: remove unused TrialRequest file
zackspear Jul 2, 2024
6228893
feat: default-popup format and css vars
zackspear Jul 2, 2024
08d6d0f
refactor: dynamix theme css var files
zackspear Jul 2, 2024
b774a1c
feat: footer css vars
zackspear Jul 3, 2024
18aea4f
chore: vscode search settings exclude symlinks
zackspear Jul 3, 2024
b6eaf07
chore: default-dynamix css comment
zackspear Jul 3, 2024
c407670
refactor: css theme file organization
zackspear Jul 3, 2024
47239d9
chore: css theme README
zackspear Jul 3, 2024
b25bd9c
chore: remove unreferenced CryptoBenchmark.php
zackspear Jul 3, 2024
e5b82cd
chore: remove unused default-popup.css
zackspear Jul 3, 2024
de822a0
fix: DockerManager.css href url
zackspear Jul 4, 2024
bd24733
chore: remove unreferenced update.crypto.php
zackspear Jul 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,8 @@ emhttp/plugins/dynamix.my.servers/unraid-components/index.html

# development scripts
.dev-scripts/
emhttp/plugins/node_modules/
emhttp/plugins/.prettierignore
emhttp/plugins/.prettierrc
emhttp/plugins/package-lock.json
emhttp/plugins/package.json
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,8 @@
"zip",
"zlib",
"libvirt-php"
]
],
"search.exclude": {
"emhttp/webGui/**/*": true,
}
}
19 changes: 15 additions & 4 deletions emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
table.ups thead tr th{width:16.6%;padding-left:10px}
table.ups tbody tr td{padding-left:10px;font-weight:bold}
tr.ups{height:3rem;line-height:3rem}
i.ups{margin-right:8px}
table.ups thead tr th {
width: 16.6%;
padding-left: 10px;
}
table.ups tbody tr td {
padding-left: 10px;
font-weight: bold;
}
tr.ups {
height: 3rem;
line-height: 3rem;
}
i.ups {
margin-right: 8px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $cpus = cpu_list();
?>
<link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.ui.css')?>">
<link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/DockerManager.css")?>">

<table id="docker_containers" class="tablesorter shift">
<thead><tr><th><a id="resetsort" class="nohand" onclick="resetSorting()" title="_(Reset sorting)_"><i class="fa fa-th-list"></i></a>_(Application)_</th><th>_(Version)_</th><th>_(Network)_</th><th>_(Port Mappings)_ <small>(_(App to Host)_)</small></th><th>_(Volume Mappings)_ <small>(_(App to Host)_)</small></th><th class="load advanced">_(CPU & Memory load)_</th><th class="nine">_(Autostart)_</th><th class="five">_(Uptime)_</th></tr></thead>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ function cpu_pinning() {
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.switchbutton.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.filetree.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/DockerManager.css")?>">

<script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
<script src="<?autov('/webGui/javascript/jquery.filetree.js')?>" charset="utf-8"></script>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

91 changes: 77 additions & 14 deletions emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,77 @@
.noshow,.advanced{display:none}
.required:after{content:" *";color:#E80000}
span.boxed{display:inline-block;line-height:normal;white-space:normal;width:60%}
span.cpu,label.checkbox{display:inline-block;width:32px}
span.ct{display:inline-block;width:230px}
span.net{display:inline-block;width:120px}
span.ip{display:inline-block;width:160px}
dl,dt,dd{line-height:normal!important;height:auto!important}
dl{padding:8px 0!important}
dl>dt:nth-of-type(2),dl>dd:nth-of-type(2){padding:20px 0 0 0!important}
input.setting_input{margin-right:4rem}
input,select{margin-top:-0.8rem!important}
div#configLocation,div#configLocation dl{padding:0!important}
div#configLocation dt{margin-top:-0.18rem!important}
.noshow,
.advanced {
display: none;
}
.required:after {
content: " *";
color: var(--red-800);
}
span.boxed {
display: inline-block;
line-height: normal;
white-space: normal;
width: 60%;
}
span.cpu,
label.checkbox {
display: inline-block;
width: 32px;
}
span.ct {
display: inline-block;
width: 230px;
}
span.net {
display: inline-block;
width: 120px;
}
span.ip {
display: inline-block;
width: 160px;
}
dl,
dt,
dd {
line-height: normal !important;
height: auto !important;
}
dl {
padding: 8px 0 !important;
}
dl > dt:nth-of-type(2),
dl > dd:nth-of-type(2) {
padding: 20px 0 0 0 !important;
}
input.setting_input {
margin-right: 4rem;
}
input,
select {
margin-top: -0.8rem !important;
}
div#configLocation,
div#configLocation dl {
padding: 0 !important;
}
div#configLocation dt {
margin-top: -0.18rem !important;
}

:root {
--add-container-file-tree-background: var(--black);
}

.Theme--azure:root,
.Theme--white:root {
--add-container-file-tree-background: var(--gray-100);
}

.fileTree {
width: 240px;
max-height: 200px;
overflow-y: scroll;
overflow-x: hidden;
position: absolute;
display: none;
background: var(--add-container-file-tree-background);
}
57 changes: 45 additions & 12 deletions emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,45 @@
.basic{display:block}
.advanced{display:none;white-space:nowrap}
.log{cursor:zoom-in}
.exec{cursor:pointer}
table#docker_containers{text-align:left}
th.five{width:5%}
th.nine{width:9%}
th.load{width:140px}
input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent}
table tbody td{line-height:normal}
i.mover{margin-right:8px;display:none}
#resetsort{margin-left:12px;display:inline-block;width:32px}
.basic {
display: block;
}
.advanced {
display: none;
white-space: nowrap;
}
.log {
cursor: zoom-in;
}
.exec {
cursor: pointer;
}
table#docker_containers {
text-align: left;
}
th.five {
width: 5%;
}
th.nine {
width: 9%;
}
th.load {
width: 140px;
}
input.wait {
width: 24px;
margin: 0 4px;
padding: 0 5px;
border: none;
box-shadow: none;
background-color: transparent;
}
table tbody td {
line-height: normal;
}
i.mover {
margin-right: 8px;
display: none;
}
#resetsort {
margin-left: 12px;
display: inline-block;
width: 32px;
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

107 changes: 90 additions & 17 deletions emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css
Original file line number Diff line number Diff line change
@@ -1,17 +1,90 @@
.errortext{color:#EF3D47;display:none;margin-left:20px}
.basic{display:inline-block}
.advanced{display:none}
select.mask{min-width:0;margin:0 10px 0 4px}
select.net{min-width:0;margin:0 4px 0 2px}
select option.hide{display:none}
input.ip4{width:100px;margin:0 4px 0 1px}
input.ip6{width:140px;margin:0 4px}
input.gw4{width:100px;margin:0 4px 0 1px}
input.gw6{width:160px;margin:0 4px}
input.pool6{width:40px;margin:0 4px 0 1px}
span.net{margin-left:4px;margin-right:2px}
span.ip4{display:inline-block;width:260px}
span.ip6{display:inline-block;width:310px}
span.gw4{display:inline-block;width:200px}
span.gw6{display:inline-block;width:270px}
span.nonexist{margin-left:20px}
:root {
--docker-settings-file-tree-background: var(--black);
--docker-settings-span-disabled-color: var(--gray-600);
}

.Theme--azure:root,
.Theme--white:root {
--docker-settings-file-tree-background: var(--gray-100);
--docker-settings-span-disabled-color: var(--gray-300); /* Condensed from: #b0b0b0 */
}

.errortext {
color: var(--red-800); /* Condensed from: #ef3d47 */
display: none;
margin-left: 20px;
}
.basic {
display: inline-block;
}
.advanced {
display: none;
}
select.mask {
min-width: 0;
margin: 0 10px 0 4px;
}
select.net {
min-width: 0;
margin: 0 4px 0 2px;
}
select option.hide {
display: none;
}
input.ip4 {
width: 100px;
margin: 0 4px 0 1px;
}
input.ip6 {
width: 140px;
margin: 0 4px;
}
input.gw4 {
width: 100px;
margin: 0 4px 0 1px;
}
input.gw6 {
width: 160px;
margin: 0 4px;
}
input.pool6 {
width: 40px;
margin: 0 4px 0 1px;
}
span.net {
margin-left: 4px;
margin-right: 2px;
}
span.ip4 {
display: inline-block;
width: 260px;
}
span.ip6 {
display: inline-block;
width: 310px;
}
span.gw4 {
display: inline-block;
width: 200px;
}
span.gw6 {
display: inline-block;
width: 270px;
}
span.nonexist {
margin-left: 20px;
}

.fileTree {
background: var(--docker-settings-file-tree-background);
width: 300px;
max-height: 150px;
overflow-y: scroll;
overflow-x: hidden;
position: absolute;
z-index: 100;
display: none;
}
span.disabled {
color: var(--docker-settings-span-disabled-color);
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading