From f499f2dd66d6e2526917c154319a1efa5f5effd3 Mon Sep 17 00:00:00 2001 From: dansheps Date: Fri, 14 Dec 2018 11:51:20 -0600 Subject: [PATCH] Closes #2693 --- netbox/project-static/css/base.css | 5 +++++ netbox/utilities/constants.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 155dd21b7..eff4876df 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -119,6 +119,11 @@ label.required { input[name="pk"] { margin-top: 0; } +/* Get around the background color problem if someone chooses white for the background */ +label[style="background-color: #ffffff"] { + color: #000000; +} + /* Tables */ th.pk, td.pk { diff --git a/netbox/utilities/constants.py b/netbox/utilities/constants.py index 64c2fab85..ad6e8fd90 100644 --- a/netbox/utilities/constants.py +++ b/netbox/utilities/constants.py @@ -2,6 +2,7 @@ COLOR_CHOICES = ( ('aa1409', 'Dark red'), ('f44336', 'Red'), ('e91e63', 'Pink'), + ('ffe4e1', 'Rose'), ('ff66ff', 'Fuschia'), ('9c27b0', 'Purple'), ('673ab7', 'Dark purple'), @@ -10,6 +11,7 @@ COLOR_CHOICES = ( ('03a9f4', 'Light blue'), ('00bcd4', 'Cyan'), ('009688', 'Teal'), + ('00ffff', 'Aqua'), ('2f6a31', 'Dark green'), ('4caf50', 'Green'), ('8bc34a', 'Light green'), @@ -23,4 +25,5 @@ COLOR_CHOICES = ( ('9e9e9e', 'Grey'), ('607d8b', 'Dark grey'), ('111111', 'Black'), + ('ffffff', 'White'), )