Skip to content

Use variables to specify color (CSS) #4359

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.

Sign up for GitHub

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

Merged
merged 18 commits into from
Jul 16, 2025
Merged

Use variables to specify color (CSS) #4359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
52f4053
Fix: Add Cpu Usage % to header for standalone server
IgorA100 Feb 24, 2024
46703b2
Merge branch 'ZoneMinder:master' into master
IgorA100 Feb 26, 2024
3d287af
Merge branch 'ZoneMinder:master' into master
IgorA100 Feb 27, 2024
9e876e7
Add getCpuUsageHTML()
IgorA100 Feb 27, 2024
ae4c712
Merge branch 'ZoneMinder:master' into master
IgorA100 Mar 4, 2024
5f2e5f4
Fix: Order of loading css files
IgorA100 Mar 5, 2024
571d2a6
Merge branch 'ZoneMinder:master' into master
IgorA100 Mar 23, 2024
8e5c318
Merge branch 'ZoneMinder:master' into master
IgorA100 May 14, 2024
65f8e23
Merge branch 'master' of https://github.com/IgorA100/zoneminder
IgorA100 Mar 13, 2025
9b03f8a
Merge branch 'master' of https://github.com/IgorA100/zoneminder
IgorA100 Mar 13, 2025
d02be70
Revert "Fix: Add Cpu Usage % to header for standalone server"
IgorA100 Apr 7, 2025
f0ca8ac
Merge branch 'ZoneMinder:master' into master
IgorA100 Apr 7, 2025
7462b44
Merge branch 'ZoneMinder:master' into master
IgorA100 Apr 15, 2025
e3cc5bd
Use variables to specify color
IgorA100 Jul 15, 2025
d15dd1f
...
IgorA100 Jul 15, 2025
eab89cb
Remove extra space
IgorA100 Jul 15, 2025
4247484
Merge branch 'master' into UseVariablesToSpecifyColor
IgorA100 Jul 15, 2025
df27822
Replace explicit color specification #485460 with variable --backgrou…
IgorA100 Jul 15, 2025
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
39 changes: 21 additions & 18 deletions web/skins/classic/css/base/skin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
--alarmBG: #FFC0C0;
--alarmText: inherit;
--backgroundMediumDark: #485460;
--colorLink: #3498db;
--colorBackgroundButtons: #3498db;
--colorBorder: #3498db;
}

html,
Expand Down Expand Up @@ -105,7 +108,7 @@ a {

a.optionhelp,
a:link {
color: #3498db;
color: var(--colorLink);
text-decoration: none;
}

Expand Down Expand Up @@ -192,8 +195,8 @@ hr {
height: 1px;
width: 100%;
border: 0;
color: #3498db;
background-color: #3498db;
color: var(--colorLink);
background-color: var(--colorBackgroundButtons);
}

/*
Expand Down Expand Up @@ -621,9 +624,9 @@ input[type=button],
input[type=submit],
.btn-primary,
.btn-primary:link {
background-color: #3498db;
background-color: var(--colorBackgroundButtons);
color: #fff;
border-color: #3498db;
border-color: var(--colorBorder);
text-transform: uppercase;
font-weight: 200;
padding: 7px 10px 5px 10px;
Expand All @@ -637,8 +640,8 @@ input[type=submit],
.btn-normal,
.btn-normal:link {
color: #fff;
background-color: #3498db;
border: 1px solid #3498db;
background-color: var(--colorBackgroundButtons);
border: 1px solid var(--colorBorder);
}

button:hover,
Expand All @@ -665,7 +668,7 @@ input[type=submit]:disabled,
padding: 0;
display: flex;
justify-content: space-between;
background-color:#485460 !important;
background-color: var(--backgroundMediumDark) !important;
}

#navbar-container > nav {
Expand All @@ -685,20 +688,20 @@ input[type=submit]:disabled,

.navbar {
padding: 0 0 0 0px;
margin-bottom: 0 !important;
border-radius: 0;
background-color:#485460 !important;
color: #0fbcf9;
border:none;
margin-bottom: 0 !important;
border-radius: 0;
background-color: var(--backgroundMediumDark) !important;
color: #0fbcf9;
border:none;
}

.navbar-brand {
margin-left: 15px;
font-weight: normal;
font-size: 30px;
font-weight: normal;
font-size: 30px;
}
.navbar-brand a {
color:#ffa801;
color:#ffa801;
}
@media (max-width: 600px){
.navbar-brand {
Expand Down Expand Up @@ -828,11 +831,11 @@ li.search-choice {
#dropdown_storage+div,
#dropdown_reminder+div,
#dropdown_bandwidth+div {
background-color:#485460;
background-color: var(--backgroundMediumDark);
}

#framesTable td:hover {
cursor: pointer;
cursor: pointer;
}

.zoom,
Expand Down
6 changes: 3 additions & 3 deletions web/skins/classic/css/base/views/filter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ min-width: 500px;
min-width: 500px;
}
form {
border-bottom: 1px solid #3498db;
border-bottom: 1px solid var(--colorBorder);
}
#ActionsAndOptions {
padding-top: 5px;
border-top: 1px solid #3498db;
border-bottom: 1px solid #3498db;
border-top: 1px solid var(--colorBorder);
border-bottom: 1px solid var(--colorBorder);
}
#ActionsAndOptions fieldset {
border: none;
Expand Down
Loading