dansheps 7 лет назад
Родитель
Сommit
f499f2dd66
2 измененных файлов с 8 добавлено и 0 удалено
  1. 5 0
      netbox/project-static/css/base.css
  2. 3 0
      netbox/utilities/constants.py

+ 5 - 0
netbox/project-static/css/base.css

@@ -119,6 +119,11 @@ label.required {
 input[name="pk"] {
 input[name="pk"] {
     margin-top: 0;
     margin-top: 0;
 }
 }
+/* Get around the background color problem if someone chooses white for the background */
+label[style="background-color: #ffffff"] {
+    color: #000000;
+}
+
 
 
 /* Tables */
 /* Tables */
 th.pk, td.pk {
 th.pk, td.pk {

+ 3 - 0
netbox/utilities/constants.py

@@ -2,6 +2,7 @@ COLOR_CHOICES = (
     ('aa1409', 'Dark red'),
     ('aa1409', 'Dark red'),
     ('f44336', 'Red'),
     ('f44336', 'Red'),
     ('e91e63', 'Pink'),
     ('e91e63', 'Pink'),
+    ('ffe4e1', 'Rose'),
     ('ff66ff', 'Fuschia'),
     ('ff66ff', 'Fuschia'),
     ('9c27b0', 'Purple'),
     ('9c27b0', 'Purple'),
     ('673ab7', 'Dark purple'),
     ('673ab7', 'Dark purple'),
@@ -10,6 +11,7 @@ COLOR_CHOICES = (
     ('03a9f4', 'Light blue'),
     ('03a9f4', 'Light blue'),
     ('00bcd4', 'Cyan'),
     ('00bcd4', 'Cyan'),
     ('009688', 'Teal'),
     ('009688', 'Teal'),
+    ('00ffff', 'Aqua'),
     ('2f6a31', 'Dark green'),
     ('2f6a31', 'Dark green'),
     ('4caf50', 'Green'),
     ('4caf50', 'Green'),
     ('8bc34a', 'Light green'),
     ('8bc34a', 'Light green'),
@@ -23,4 +25,5 @@ COLOR_CHOICES = (
     ('9e9e9e', 'Grey'),
     ('9e9e9e', 'Grey'),
     ('607d8b', 'Dark grey'),
     ('607d8b', 'Dark grey'),
     ('111111', 'Black'),
     ('111111', 'Black'),
+    ('ffffff', 'White'),
 )
 )