Skip to content

Fix diff2html colors being unreadable in dark mode #1153

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
agreen wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix diff2html colors being unreadable in dark mode #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 changes/1152.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed diff2html colors being unreadable in Config Compliance and Config Plan diff views when Nautobot is in dark mode.
36 changes: 36 additions & 0 deletions ...golden_config/static/nautobot_golden_config/diff2html-3.4.43/diff2html-dark-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Dark-mode overrides for nautobot-golden-config's vendored diff2html 3.4.43 CSS.
* diff2html.min.css ships a single hardcoded light palette with no dark variant,
* which is unreadable against Nautobot's own dark theme. Scoped under Nautobot's
* existing [data-bs-theme="dark"] attribute so light-mode users are unaffected.
* Upstream bug: https://github.com/nautobot/nautobot-app-golden-config/issues/1152
*/
[data-bs-theme="dark"] .d2h-wrapper,
[data-bs-theme="dark"] .d2h-file-wrapper,
[data-bs-theme="dark"] .d2h-file-diff,
[data-bs-theme="dark"] .d2h-diff-table,
[data-bs-theme="dark"] .d2h-file-side-diff { background-color:#26282c; }
[data-bs-theme="dark"] .d2h-file-header { background-color:#35383e; border-bottom:1px solid #46494f; color:#ececec; }
[data-bs-theme="dark"] .d2h-file-header .d2h-file-name-wrapper { color:#ececec; }
[data-bs-theme="dark"] .d2h-file-header .d2h-file-name { color:#7fb3e6; }
[data-bs-theme="dark"] .d2h-file-wrapper { border:1px solid #40444a; }
[data-bs-theme="dark"] .d2h-cntx,
[data-bs-theme="dark"] td.d2h-code-side-line:not(.d2h-ins):not(.d2h-del) { background-color:#26282c; color:#d4d4d4; }
[data-bs-theme="dark"] .d2h-code-linenumber,
[data-bs-theme="dark"] .d2h-code-side-linenumber { background-color:#202225; border-color:#3a3d42; color:rgba(255,255,255,.35); }
[data-bs-theme="dark"] .d2h-code-side-emptyplaceholder,
[data-bs-theme="dark"] .d2h-emptyplaceholder { background-color:#202225; border-color:#3a3d42; }
[data-bs-theme="dark"] .d2h-info { background-color:#35383e; border-color:#46494f; color:#c7c7c7; }
[data-bs-theme="dark"] .d2h-del { background-color:#3a2528; border-color:#5c3438; color:#e7c4c6; }
[data-bs-theme="dark"] .d2h-ins { background-color:#22332a; border-color:#35503f; color:#c3e6cd; }
[data-bs-theme="dark"] .d2h-file-diff .d2h-del.d2h-change { background-color:#3d3320; }
[data-bs-theme="dark"] .d2h-file-diff .d2h-ins.d2h-change { background-color:#223324; }
[data-bs-theme="dark"] .d2h-code-line,
[data-bs-theme="dark"] .d2h-code-side-line,
[data-bs-theme="dark"] .d2h-code-line-ctn { color:#d4d4d4; }
[data-bs-theme="dark"] .d2h-code-line del,
[data-bs-theme="dark"] .d2h-code-side-line del { background-color:#6e2f34; color:#f2c1c4; }
[data-bs-theme="dark"] .d2h-code-line ins,
[data-bs-theme="dark"] .d2h-code-side-line ins { background-color:#2c5c3d; color:#b7ecc4; }
[data-bs-theme="dark"] .d2h-lines-added { color:#7fd99a; border-color:#35503f; background:transparent; }
[data-bs-theme="dark"] .d2h-lines-deleted { color:#e7999c; border-color:#5c3438; background:transparent; }
1 change: 1 addition & 0 deletions nautobot_golden_config/templates/nautobot_golden_config/goldenconfig_detailsmodal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% load static %}
<!-- Reference https://cdn.jsdelivr.net/npm/diff2html/bundles/ and obtain files and version folder name -->
<link href="{% static 'nautobot_golden_config/diff2html-3.4.43/diff2html.min.css' %}" rel="stylesheet" type="text/css"/>
<link href="{% static 'nautobot_golden_config/diff2html-3.4.43/diff2html-dark-overrides.css' %}" rel="stylesheet" type="text/css"/>
<script src="{% static 'nautobot_golden_config/diff2html-3.4.43/diff2html.min.js' %}" type="text/javascript"></script>
<style>
.d2h-tag {
Expand Down