Skip to content

Issues/720 theme colors from openwisp utils #760

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

Open
shakurah wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Issues/720 theme colors from openwisp utils #760

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b740dea
fix: replace serializers.Serializer with MonitoringDeviceDetailSerial…
shakurah Feb 24, 2026
8cb6d0d
[fix] REST API: device monitoring API mentions unused fields example …
shakurah Feb 25, 2026
dfbca66
Merge branch 'master' into fix/716-removed-unused-api-fields
shakurah Feb 26, 2026
dedd8c8
Merge branch 'openwisp:master' into fix/716-removed-unused-api-fields
shakurah Feb 28, 2026
62f996d
refactor: replace direct MonitoringDeviceDetailSerializer usage with …
shakurah Mar 3, 2026
7f5e523
[refactor] Use self.serializer_class Instead of Hard Coded Serializer…
shakurah Mar 3, 2026
068e985
[fix] Use self.serializers instead of hard-code serializers #716
shakurah Mar 3, 2026
fa0f2ab
[fix] Use self.serializers instead of hard Coded Serializer #716
shakurah Mar 4, 2026
d116a94
[fix] Replace hardcoded serializer with self.serializer_class #716
shakurah Mar 6, 2026
466e6bc
Merge branch 'master' into fix/716-removed-unused-api-fields
shakurah Mar 6, 2026
f42eaeb
[fix] Replace hardcoded serializer with self.serializer_class #716
shakurah Mar 9, 2026
fd7fc89
[fix] Replace hardcoded serializer with self.serializer_class #716
shakurah Mar 9, 2026
e79761b
[ci] Ensure Django Is Installed Before Package in GitHub Actions
shakurah Mar 9, 2026
570b548
[chores] Use theme colors from openwisp-utils variables #720
shakurah Mar 11, 2026
75fb376
[chores] Use theme colors from openwisp-utils variables #720
shakurah Mar 13, 2026
ccf9827
Merge branch 'master' into issues/720-theme-colors-from-openwisp-utils
shakurah Mar 13, 2026
09419c4
[chores] Use theme colors from openwisp-utils variables #720
shakurah Mar 13, 2026
2124be5
Merge branch 'issues/720-theme-colors-from-openwisp-utils' of github.…
shakurah Mar 13, 2026
9cda9fb
[chores] Use theme colors from openwisp-utils variables #720
shakurah Mar 14, 2026
f7d7945
Merge branch 'issues/720-theme-colors-from-openwisp-utils' of github.…
shakurah Mar 14, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ jobs:
spatialite-bin \
libsqlite3-mod-spatialite
pip install -U pip wheel setuptools
pip install -U ${{ matrix.django-version }}
pip install -r requirements-test.txt
pip install -U -I -e .
pip install -U ${{ matrix.django-version }}
Comment on lines +85 to 88
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Duplicate Django installation and unrelated change to PR scope.

Line 85 installs the Django matrix version, but line 88 performs the same installation again. This creates redundancy:

  1. If the intent is to ensure the correct Django version after other packages run, only line 88 is necessary.
  2. If the intent is to have Django available before requirements-test.txt runs, line 85 alone would suffice (assuming requirements-test.txt doesn't pin a conflicting Django version).

Additionally, this CI change appears unrelated to the PR's stated objective of replacing hardcoded color values with theme variables. Consider either:

  • Removing the duplicate installation, or
  • Splitting this CI change into a separate PR with appropriate context
Suggested fix (keep only the later install) 
         pip install -U pip wheel setuptools
-        pip install -U ${{ matrix.django-version }}
         pip install -r requirements-test.txt
         pip install -U -I -e .
         pip install -U ${{ matrix.django-version }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
pip install -U ${{ matrix.django-version }}
pip install -r requirements-test.txt
pip install -U -I -e .
pip install -U ${{ matrix.django-version }}
pip install -r requirements-test.txt
pip install -U -I -e .
pip install -U ${{ matrix.django-version }}
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.github/workflows/ci.yml around lines 85 - 88, Remove the duplicate Django
installation in the CI workflow by keeping only the later pip install -U ${{
matrix.django-version }} invocation; specifically, delete the earlier pip
install -U ${{ matrix.django-version }} that appears before pip install -r
requirements-test.txt so the step sequence is: pip install -r
requirements-test.txt, pip install -U -I -e ., pip install -U ${{
matrix.django-version }} (or alternatively keep only the first install and
remove the later one if you need Django available before installing
requirements), and do not bundle this CI tweak with the color-to-theme PR—if
this change is unrelated, split it into a dedicated PR.

Expand Down
2 changes: 1 addition & 1 deletion openwisp_monitoring/device/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def register_dashboard_items(self):
"problem": "#ffb442",
"critical": "#a72d1d",
"unknown": "#353c44",
"deactivated": "#000",
"deactivated": "var(--ow-color-black)",
},
"labels": {
"ok": app_settings.HEALTH_STATUS_LABELS["ok"],
Expand Down
40 changes: 20 additions & 20 deletions openwisp_monitoring/device/static/monitoring/css/daterangepicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.daterangepicker {
position: absolute;
color: inherit;
background-color: #fff;
background-color: var(--ow-color-white);
border-radius: 4px;
border: 1px solid #ddd;
width: 278px;
Expand Down Expand Up @@ -32,7 +32,7 @@
.daterangepicker:after {
top: -6px;
border-right: 6px solid transparent;
border-bottom: 6px solid #fff;
border-bottom: 6px solid var(--ow-color-white);
border-left: 6px solid transparent;
}
.daterangepicker.opensleft:before {
Expand Down Expand Up @@ -74,7 +74,7 @@
top: initial;
bottom: -6px;
border-bottom: initial;
border-top: 6px solid #fff;
border-top: 6px solidvar(--ow-color-white);
}
.daterangepicker.single .daterangepicker .ranges,
.daterangepicker.single .drp-calendar {
Expand Down Expand Up @@ -107,7 +107,7 @@
}
.daterangepicker .calendar-table .next span,
.daterangepicker .calendar-table .prev span {
color: #fff;
color: var(--ow-color-white);
border: solid black;
border-width: 0 2px 2px 0;
border-radius: 0;
Expand Down Expand Up @@ -138,9 +138,9 @@
cursor: pointer;
}
.daterangepicker .calendar-table {
border: 1px solid #fff;
border: 1px solidvar(--ow-color-white);
border-radius: 4px;
background-color: #fff;
background-color: var(--ow-color-white);
}
.daterangepicker .calendar-table table {
width: 100%;
Expand All @@ -163,14 +163,14 @@
.daterangepicker td.off.in-range,
.daterangepicker td.off.start-date,
.daterangepicker td.off.end-date {
background-color: #fff;
background-color: var(--ow-color-white);
border-color: transparent;
color: #999;
}
.daterangepicker td.in-range {
background-color: #ebf4f8;
border-color: transparent;
color: #000;
color: var(--ow-color-black);
border-radius: 0;
}
.daterangepicker td.start-date {
Expand All @@ -186,7 +186,7 @@
.daterangepicker td.active:hover {
background-color: #357ebd;
border-color: transparent;
color: #fff;
color: var(--ow-color-white);
}
.daterangepicker th.month {
width: auto;
Expand Down Expand Up @@ -290,7 +290,7 @@
}
.daterangepicker .ranges li.active {
background-color: #08c;
color: #fff;
color: var(--ow-color-white);
}
.daterangepicker {
width: auto;
Expand Down Expand Up @@ -341,15 +341,15 @@
}
.daterangepicker .ranges ul li.active {
background-color: #fce5e5;
color: #df5d43;
color: var(--ow-color-primary);
}
.daterangepicker .ranges ul li:hover {
background-color: #fce5e5;
color: #e4715a;
}
.daterangepicker .drp-buttons button.btn {
margin: 0 2px;
color: #fff;
color: var(--ow-color-white);
background-color: #666;
padding: 5px 15px;
text-decoration: none;
Expand All @@ -361,12 +361,12 @@
.daterangepicker td.active,
.daterangepicker td.active:hover {
border-radius: 1.25px;
color: #fff;
background-color: #df5d43;
color: var(--ow-color-white);
background-color: var(--ow-color-primary);
border-color: transparent;
}
.daterangepicker td.in-range {
background-color: #df5d43;
background-color: var(--ow-color-primary);
border-color: transparent;

color: white;
Expand All @@ -375,24 +375,24 @@
.daterangepicker td.in-range:hover {
color: white;
border-radius: 1, 25px;
background-color: #df5d43;
background-color: var(--ow-color-primary);
}
.daterangepicker .drp-buttons button.btn {
background-color: #333;
background-color: var(--ow-color-fg-darker);
border-radius: 3.75px;
}
.daterangepicker .drp-buttons button.btn:hover {
background-color: #777;
background-color: var(--ow-color-fg-dark);
}
.daterangepicker td.off,
.daterangepicker td.off.in-range,
.daterangepicker td.off.start-date,
.daterangepicker td.off.end-date :hover {
background-color: #fff;
background-color: var(--ow-color-white);
color: rgba(119, 119, 119, 0.56);
}
.daterangepicker .drp-selected {
color: #df5d43;
color: var(--ow-color-primary);
}
.daterangepicker .drp-calendar {
max-width: 370px;
Expand Down
12 changes: 6 additions & 6 deletions openwisp_monitoring/device/static/monitoring/css/device-map.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.health-deactivated {
color: #000;
color: var(--ow-color-black);
background-color: #f2f4f7;
border: 1px solid #d0d5dd;
}
Expand Down Expand Up @@ -60,7 +60,7 @@
padding-top: 115px;
}
.no-data a.button {
color: #fff;
color: var(--ow-color-white);
padding: 5px 10px;
font-weight: bold;
text-decoration: none !important;
Expand Down Expand Up @@ -238,9 +238,9 @@
border-radius: 12px;
display: flex;
flex-direction: column;
box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
box-shadow: 0 3px 14px var(--ow-overlay-40);
pointer-events: all;
background: #fff;
background: var(--ow-color-white);
flex-grow: 1;
}
#floorplan-close-btn {
Expand All @@ -263,7 +263,7 @@
margin: 0;
padding: 0;
font-size: 18px;
color: #333;
color: var(--ow-color-fg-darker);
white-space: normal;
display: inline-block;
}
Expand Down Expand Up @@ -306,7 +306,7 @@
display: flex;
flex-direction: row;
align-items: center;
box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
box-shadow: 0 3px 14px var(--ow-overlay-40);
}

.floor-btn {
Expand Down
2 changes: 1 addition & 1 deletion openwisp_monitoring/device/static/monitoring/css/leaflet.fullscreen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.njg-container .leaflet-control-fullscreen a {
background: #fff url(fullscreen.png) no-repeat 0 0;
background: var(--ow-color-white) url("fullscreen.png") no-repeat 0 0;
background-size: 26px 52px;
}
.njg-container .leaflet-touch .leaflet-control-fullscreen a {
Expand Down
8 changes: 4 additions & 4 deletions openwisp_monitoring/device/static/monitoring/css/monitoring.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
padding: 0 1px;
}
#ow-device-status h2 {
color: #333;
background-color: rgba(0, 0, 0, 0.05);
color: var(--ow-color-fg-darker);
background-color: var(--ow-overlay-5);
outline: 1px solid rgba(0, 0, 0, 0.3);
padding: 15px;
}
Expand Down Expand Up @@ -31,15 +31,15 @@
}
#ow-device-status th {
border-top: 0 none;
background: #f9f9f9 !important;
background: var(--ow-color-fg-lightest) !important;
}
td.field-health_status,
.field-health_status .readonly {
font-weight: bold;
text-transform: uppercase;
}
.health-deactivated {
color: #000;
color: var(--ow-color-black);
}
.health-unknown {
color: grey;
Expand Down
8 changes: 4 additions & 4 deletions openwisp_monitoring/device/static/monitoring/css/netjsongraph.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
background-size: 20px 20px !important;
}
.njg-container .marker-cluster div {
color: #fff;
color: var(--ow-color-white);
background-color: rgba(53, 60, 68, 0.8) !important;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
.njg-container .ok div {
Expand Down Expand Up @@ -74,7 +74,7 @@
display: none;
}
.njg-container .njg-tooltip {
background: #fff !important;
background: var(--ow-color-white) !important;
border: none !important;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
.njg-container .njg-tooltip-item {
Expand All @@ -90,12 +90,12 @@
flex-wrap: wrap;
text-transform: capitalize;
font-weight: 600;
color: #000;
color: var(--ow-color-black);
}
.njg-container .njg-tooltip-value {
display: inline-flex;
align-items: center;
flex-wrap: wrap;
flex-basis: 60%;
color: #000;
color: var(--ow-color-black);
}
2 changes: 1 addition & 1 deletion openwisp_monitoring/device/static/monitoring/css/percircle.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading