Merge pull request #2130 from unraid/refactor/consolidate-jquery-ui-overwrites

refactor: migrate remaining dynamix-jquery-ui.css to default-dynamix.css
This commit is contained in:
tom mortensen
2025-04-08 17:22:21 -07:00
committed by GitHub
3 changed files with 279 additions and 279 deletions

View File

@@ -54,7 +54,6 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-color-palette.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-base.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-dynamix.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix/styles/dynamix-jquery-ui.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/themes/{$display['theme']}.css")?>">
<style>

View File

@@ -1580,4 +1580,282 @@ div.icon-zip {
border: none;
min-width: auto;
}
}
}
/*
- Styles migrated from original file dynamix.docker.manager/styles/DockerManager.css
- Majority of these styles appear to be modifying /webGui/styles/jquery.ui.css
*/
.Theme--azure:root,
.Theme--white:root {
--dynamix-jquery-ui-button-text-color: var(--orange-500);
--dynamix-jquery-ui-button-background-start: var(--red-800);
--dynamix-jquery-ui-button-background-end: var(--orange-500);
--dynamix-jquery-ui-button-hover-color: var(--gray-100);
--dynamix-jquery-ui-default-background: transparent;
--dynamix-jquery-ui-border-color: var(--black);
--dynamix-jquery-ui-header-background: var(--gray-150); /* Condensed from: #e3e3e3 */
--dynamix-jquery-ui-header-color: var(--black);
--dynamix-jquery-ui-content-background: var(--gray-100);
--dynamix-jquery-ui-content-color: var(--black);
--dynamix-jquery-ui-active-background: var(--gray-150);
--dynamix-jquery-ui-dropcontainer-background: var(--gray-100);
--dynamix-jquery-ui-disabled-color: var(--black);
--dynamix-jquery-ui-disabled-border-color: var(--gray-400); /* Condensed from: #a2a2a2 */
--dynamix-jquery-ui-disabled-background: var(--gray-150);
--dynamix-jquery-ui-text-color: var(--black);
}
.Theme--black:root,
.Theme--gray:root {
--dynamix-jquery-ui-button-text-color: var(--orange-500);
--dynamix-jquery-ui-button-background-start: var(--red-800);
--dynamix-jquery-ui-button-background-end: var(--orange-500);
--dynamix-jquery-ui-button-hover-color: var(--gray-100);
--dynamix-jquery-ui-default-background: transparent;
--dynamix-jquery-ui-border-color: var(--gray-200); /* Condensed from: #e5e5e5 */
--dynamix-jquery-ui-header-background: var(--gray-800); /* Condensed from: #2b2b2b */
--dynamix-jquery-ui-header-color: var(--gray-100);
--dynamix-jquery-ui-content-background: var(--black);
--dynamix-jquery-ui-content-color: var(--gray-100);
--dynamix-jquery-ui-active-background: var(--gray-700); /* Condensed from: #262626 */
--dynamix-jquery-ui-dropcontainer-background: var(--black);
--dynamix-jquery-ui-disabled-color: var(--gray-100);
--dynamix-jquery-ui-disabled-border-color: var(--gray-500); /* Condensed from: #6c6c6c */
--dynamix-jquery-ui-disabled-background: var(--gray-700); /* Condensed from: #262626 */
--dynamix-jquery-ui-text-color: var(--gray-100);
}
.ui-dialog {
.ui-dialog-buttonpane {
.ui-dialog-buttonset {
button {
font-family: clear-sans;
font-size: 1.1rem;
font-weight: bold;
letter-spacing: 2px;
text-transform: uppercase;
margin: 10px 12px 10px 0;
padding: 9px 18px;
text-decoration: none;
white-space: nowrap;
cursor: pointer;
outline: none;
border-radius: 4px;
border: 0;
color: var(--dynamix-jquery-ui-button-text-color);
background:
-webkit-gradient(
linear,
left top,
right top,
from(var(--dynamix-jquery-ui-button-background-start)),
to(var(--dynamix-jquery-ui-button-background-end))
)
0 0 no-repeat,
-webkit-gradient(
linear,
left top,
right top,
from(var(--dynamix-jquery-ui-button-background-start)),
to(var(--dynamix-jquery-ui-button-background-end))
) 0 100% no-repeat,
-webkit-gradient(
linear,
left bottom,
left top,
from(var(--dynamix-jquery-ui-button-background-start)),
to(var(--dynamix-jquery-ui-button-background-start))
) 0 100% no-repeat,
-webkit-gradient(
linear,
left bottom,
left top,
from(var(--dynamix-jquery-ui-button-background-end)),
to(var(--dynamix-jquery-ui-button-background-end))
) 100% 100% no-repeat;
background:
linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end)) 0 0 no-repeat,
linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end)) 0 100% no-repeat,
linear-gradient(0deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-start)) 0 100% no-repeat,
linear-gradient(0deg, var(--dynamix-jquery-ui-button-background-end) 0, var(--dynamix-jquery-ui-button-background-end)) 100% 100% no-repeat;
background-size:
100% 2px,
100% 2px,
2px 100%,
2px 100%;
&:hover {
color: var(--dynamix-jquery-ui-button-hover-color);
background: -webkit-gradient(
linear,
left top,
right top,
from(var(--dynamix-jquery-ui-button-background-start)),
to(var(--dynamix-jquery-ui-button-background-end))
);
background: linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end));
}
}
}
}
}
/* Consolidated .ui-dropdownchecklist styles */
.ui-dropdownchecklist {
background-color: transparent;
background-image: linear-gradient(66.6deg, transparent 60%, var(--input-border-color) 40%),
linear-gradient(113.4deg, var(--input-border-color) 40%, transparent 60%);
background-position: calc(100% - 4px), 100%;
background-size:
4px 6px,
4px 6px;
background-repeat: no-repeat;
border: none;
border-bottom: 1px solid var(--input-border-color);
outline: none;
height: 2.5rem;
line-height: 2.5rem;
cursor: pointer;
.ui-state-default {
background: var(--dynamix-jquery-ui-default-background);
border: none;
box-shadow: none;
outline: none;
cursor: pointer;
height: 2.2rem;
line-height: 2.2rem;
padding: 0;
}
.ui-widget-content {
.ui-state-default {
background: var(--dynamix-jquery-ui-default-background);
}
}
}
.ui-dropdownchecklist-dropcontainer-wrapper {
transform: translateY(-1px);
}
.ui-dropdownchecklist-group {
font-weight: normal;
font-style: italic;
padding: 1px 9px 1px 8px;
}
.ui-dropdownchecklist-selector {
border: none;
border-bottom: 1px solid var(--dynamix-ui-dropdownchecklist-color);
outline: none;
display: inline-block;
cursor: pointer;
padding: 1px 0;
}
.ui-dropdownchecklist-selector-wrapper {
vertical-align: middle;
font-size: 0;
}
.ui-dropdownchecklist-dropcontainer {
color: var(--dynamix-ui-dropdownchecklist-color);
background-color: var(--dynamix-ui-dropdownchecklist-color-alt1);
border: 1px solid var(--dynamix-jquery-ui-border-color);
}
.ui-state-disabled {
color: var(--dynamix-ui-dropdownchecklist-color);
border-bottom-color: var(--dynamix-ui-dropdownchecklist-color-alt2);
opacity: 0.5;
cursor: default;
}
.ui-dropdownchecklist-indent {
padding-left: 7px;
}
.ui-dropdownchecklist-text {
font-family: clear-sans;
font-size: 1.3rem;
color: var(--dynamix-ui-dropdownchecklist-color);
}
.ui-dropdownchecklist-item {
height: 2.2rem;
line-height: 2.2rem;
input {
vertical-align: top;
}
}
/* Theme-specific styles for sidebar */
.Theme--sidebar {
.ui-dropdownchecklist {
height: 3rem;
line-height: 3rem;
border: 1px solid var(--border-color);
background-position: calc(100% - 8px), calc(100% - 4px);
}
.ui-dropdownchecklist-selector {
padding: 4px 6px 1px 6px;
/* 1px 14px 1px 6px makes the dropdown wider for the share read / write dropdown but
IMO not needed because it makes the dropdown too wide when accompany other select inputs */
}
.ui-dropdownchecklist-group {
padding: 1px 6px;
}
.ui-dropdownchecklist-dropcontainer {
border: 1px solid var(--dynamix-ui-dropdownchecklist-dropcontainer-border-color);
}
.ui-state-disabled {
opacity: 0.3;
}
.ui-dropdownchecklist-indent {
padding-left: 9px;
}
}
.ui-widget-header {
border: none;
background: var(--dynamix-jquery-ui-header-background);
color: var(--dynamix-jquery-ui-header-color);
font-weight: bold;
}
.ui-widget-content {
border: 1px solid var(--dynamix-jquery-ui-border-color);
background: var(--dynamix-jquery-ui-content-background);
color: var(--dynamix-jquery-ui-content-color);
}
.ui-state-active {
background: var(--dynamix-jquery-ui-active-background);
}
.ui-tailscale {
&-row {
display: flex;
justify-content: space-between;
min-width: 300px;
width: 100%;
flex-wrap: nowrap;
overflow-x: auto;
}
&-label {
flex: 1;
}
&-value {
flex: 3;
}
}

View File

@@ -1,277 +0,0 @@
/*
- Styles migrated from original file dynamix.docker.manager/styles/DockerManager.css
- Majority of these styles appear to be modifying /webGui/styles/jquery.ui.css
*/
.Theme--azure:root,
.Theme--white:root {
--dynamix-jquery-ui-button-text-color: var(--orange-500);
--dynamix-jquery-ui-button-background-start: var(--red-800);
--dynamix-jquery-ui-button-background-end: var(--orange-500);
--dynamix-jquery-ui-button-hover-color: var(--gray-100);
--dynamix-jquery-ui-default-background: transparent;
--dynamix-jquery-ui-border-color: var(--black);
--dynamix-jquery-ui-header-background: var(--gray-150); /* Condensed from: #e3e3e3 */
--dynamix-jquery-ui-header-color: var(--black);
--dynamix-jquery-ui-content-background: var(--gray-100);
--dynamix-jquery-ui-content-color: var(--black);
--dynamix-jquery-ui-active-background: var(--gray-150);
--dynamix-jquery-ui-dropcontainer-background: var(--gray-100);
--dynamix-jquery-ui-disabled-color: var(--black);
--dynamix-jquery-ui-disabled-border-color: var(--gray-400); /* Condensed from: #a2a2a2 */
--dynamix-jquery-ui-disabled-background: var(--gray-150);
--dynamix-jquery-ui-text-color: var(--black);
}
.Theme--black:root,
.Theme--gray:root {
--dynamix-jquery-ui-button-text-color: var(--orange-500);
--dynamix-jquery-ui-button-background-start: var(--red-800);
--dynamix-jquery-ui-button-background-end: var(--orange-500);
--dynamix-jquery-ui-button-hover-color: var(--gray-100);
--dynamix-jquery-ui-default-background: transparent;
--dynamix-jquery-ui-border-color: var(--gray-200); /* Condensed from: #e5e5e5 */
--dynamix-jquery-ui-header-background: var(--gray-800); /* Condensed from: #2b2b2b */
--dynamix-jquery-ui-header-color: var(--gray-100);
--dynamix-jquery-ui-content-background: var(--black);
--dynamix-jquery-ui-content-color: var(--gray-100);
--dynamix-jquery-ui-active-background: var(--gray-700); /* Condensed from: #262626 */
--dynamix-jquery-ui-dropcontainer-background: var(--black);
--dynamix-jquery-ui-disabled-color: var(--gray-100);
--dynamix-jquery-ui-disabled-border-color: var(--gray-500); /* Condensed from: #6c6c6c */
--dynamix-jquery-ui-disabled-background: var(--gray-700); /* Condensed from: #262626 */
--dynamix-jquery-ui-text-color: var(--gray-100);
}
.ui-dialog {
.ui-dialog-buttonpane {
.ui-dialog-buttonset {
button {
font-family: clear-sans;
font-size: 1.1rem;
font-weight: bold;
letter-spacing: 2px;
text-transform: uppercase;
margin: 10px 12px 10px 0;
padding: 9px 18px;
text-decoration: none;
white-space: nowrap;
cursor: pointer;
outline: none;
border-radius: 4px;
border: 0;
color: var(--dynamix-jquery-ui-button-text-color);
background:
-webkit-gradient(
linear,
left top,
right top,
from(var(--dynamix-jquery-ui-button-background-start)),
to(var(--dynamix-jquery-ui-button-background-end))
)
0 0 no-repeat,
-webkit-gradient(
linear,
left top,
right top,
from(var(--dynamix-jquery-ui-button-background-start)),
to(var(--dynamix-jquery-ui-button-background-end))
) 0 100% no-repeat,
-webkit-gradient(
linear,
left bottom,
left top,
from(var(--dynamix-jquery-ui-button-background-start)),
to(var(--dynamix-jquery-ui-button-background-start))
) 0 100% no-repeat,
-webkit-gradient(
linear,
left bottom,
left top,
from(var(--dynamix-jquery-ui-button-background-end)),
to(var(--dynamix-jquery-ui-button-background-end))
) 100% 100% no-repeat;
background:
linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end)) 0 0 no-repeat,
linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end)) 0 100% no-repeat,
linear-gradient(0deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-start)) 0 100% no-repeat,
linear-gradient(0deg, var(--dynamix-jquery-ui-button-background-end) 0, var(--dynamix-jquery-ui-button-background-end)) 100% 100% no-repeat;
background-size:
100% 2px,
100% 2px,
2px 100%,
2px 100%;
&:hover {
color: var(--dynamix-jquery-ui-button-hover-color);
background: -webkit-gradient(
linear,
left top,
right top,
from(var(--dynamix-jquery-ui-button-background-start)),
to(var(--dynamix-jquery-ui-button-background-end))
);
background: linear-gradient(90deg, var(--dynamix-jquery-ui-button-background-start) 0, var(--dynamix-jquery-ui-button-background-end));
}
}
}
}
}
/* Consolidated .ui-dropdownchecklist styles */
.ui-dropdownchecklist {
background-color: transparent;
background-image: linear-gradient(66.6deg, transparent 60%, var(--input-border-color) 40%),
linear-gradient(113.4deg, var(--input-border-color) 40%, transparent 60%);
background-position: calc(100% - 4px), 100%;
background-size:
4px 6px,
4px 6px;
background-repeat: no-repeat;
border: none;
border-bottom: 1px solid var(--input-border-color);
outline: none;
height: 2.5rem;
line-height: 2.5rem;
cursor: pointer;
.ui-state-default {
background: var(--dynamix-jquery-ui-default-background);
border: none;
box-shadow: none;
outline: none;
cursor: pointer;
height: 2.2rem;
line-height: 2.2rem;
padding: 0;
}
.ui-widget-content {
.ui-state-default {
background: var(--dynamix-jquery-ui-default-background);
}
}
}
.ui-dropdownchecklist-dropcontainer-wrapper {
transform: translateY(-1px);
}
.ui-dropdownchecklist-group {
font-weight: normal;
font-style: italic;
padding: 1px 9px 1px 8px;
}
.ui-dropdownchecklist-selector {
border: none;
border-bottom: 1px solid var(--dynamix-ui-dropdownchecklist-color);
outline: none;
display: inline-block;
cursor: pointer;
padding: 1px 0;
}
.ui-dropdownchecklist-selector-wrapper {
vertical-align: middle;
font-size: 0;
}
.ui-dropdownchecklist-dropcontainer {
color: var(--dynamix-ui-dropdownchecklist-color);
background-color: var(--dynamix-ui-dropdownchecklist-color-alt1);
border: 1px solid var(--dynamix-jquery-ui-border-color);
}
.ui-state-disabled {
color: var(--dynamix-ui-dropdownchecklist-color);
border-bottom-color: var(--dynamix-ui-dropdownchecklist-color-alt2);
opacity: 0.5;
cursor: default;
}
.ui-dropdownchecklist-indent {
padding-left: 7px;
}
.ui-dropdownchecklist-text {
font-family: clear-sans;
font-size: 1.3rem;
color: var(--dynamix-ui-dropdownchecklist-color);
}
.ui-dropdownchecklist-item {
height: 2.2rem;
line-height: 2.2rem;
input {
vertical-align: top;
}
}
/* Theme-specific styles for sidebar */
.Theme--sidebar {
.ui-dropdownchecklist {
height: 3rem;
line-height: 3rem;
border: 1px solid var(--border-color);
background-position: calc(100% - 8px), calc(100% - 4px);
}
.ui-dropdownchecklist-selector {
padding: 4px 6px 1px 6px;
/* 1px 14px 1px 6px makes the dropdown wider for the share read / write dropdown but
IMO not needed because it makes the dropdown too wide when accompany other select inputs */
}
.ui-dropdownchecklist-group {
padding: 1px 6px;
}
.ui-dropdownchecklist-dropcontainer {
border: 1px solid var(--dynamix-ui-dropdownchecklist-dropcontainer-border-color);
}
.ui-state-disabled {
opacity: 0.3;
}
.ui-dropdownchecklist-indent {
padding-left: 9px;
}
}
.ui-widget-header {
border: none;
background: var(--dynamix-jquery-ui-header-background);
color: var(--dynamix-jquery-ui-header-color);
font-weight: bold;
}
.ui-widget-content {
border: 1px solid var(--dynamix-jquery-ui-border-color);
background: var(--dynamix-jquery-ui-content-background);
color: var(--dynamix-jquery-ui-content-color);
}
.ui-state-active {
background: var(--dynamix-jquery-ui-active-background);
}
.ui-tailscale {
&-row {
display: flex;
justify-content: space-between;
min-width: 300px;
width: 100%;
flex-wrap: nowrap;
overflow-x: auto;
}
&-label {
flex: 1;
}
&-value {
flex: 3;
}
}