diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index fa2a1fd4a..2cc3536b3 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -16,6 +16,7 @@ * [#8077](https://github.com/netbox-community/netbox/issues/8077) - Fix exception when attaching image to location, circuit, or power panel * [#8078](https://github.com/netbox-community/netbox/issues/8078) - Add missing wireless models to `lsmodels()` in `nbshell` * [#8079](https://github.com/netbox-community/netbox/issues/8079) - Fix validation of LLDP neighbors when connected device has an asset tag +* [#8088](https://github.com/netbox-community/netbox/issues/8088) - Improve legibility of text in labels with light-colored backgrounds --- diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 267bf7115..db9c40fc5 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -233,7 +233,7 @@ def fgcolor(value): value = value.lower().strip('#') if not re.match('^[0-9a-f]{6}$', value): return '' - return '#{}'.format(foreground_color(value)) + return f'#{foreground_color(value)}' @register.filter() diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py index 203c12b3f..f12bc2569 100644 --- a/netbox/utilities/utils.py +++ b/netbox/utilities/utils.py @@ -53,9 +53,10 @@ def foreground_color(bg_color, dark='000000', light='ffffff'): :param dark: RBG color code for dark text :param light: RBG color code for light text """ + THRESHOLD = 150 bg_color = bg_color.strip('#') r, g, b = [int(bg_color[c:c + 2], 16) for c in (0, 2, 4)] - if r * 0.299 + g * 0.587 + b * 0.114 > 186: + if r * 0.299 + g * 0.587 + b * 0.114 > THRESHOLD: return dark else: return light