vulnerabilities.cgi: Use CSS to colour the table

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index d8d82e2ca321aa0fb8b02a5397189bfcab3345c6..01618449f971a9ea708291709d8efc9c2165476a 100644 (file)
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -1,5 +1,4 @@
 :root {
-<<<<<<< HEAD
        --color-green          : #339933;
        --color-green-invert   : #ffffff;
        --color-red            : #993333;
@@ -18,14 +17,6 @@
        --color-primary        : #ff2e52;
        --color-primary-invert : #ffffff;
        --color-text           : #363636;
-=======
-       --color-green        : #339933;
-       --color-green-invert : #ffffff;
-       --color-red          : #993333;
-       --color-red-invert   : #ffffff;
-       --color-grey         : #d6d6d6;
-       --color-light-grey   : #f0f0f0;
->>>>>>> 17ed2e345 (CSS: Automatically stripe all tables)
 }
 
 /* This controls the width of the fixed width layouts */
@@ -506,20 +497,12 @@ table.form tr.action td form {
        font-weight: bold;
 }
 
-<<<<<<< HEAD
 .tbl .status.is-running, .tbl .status.is-connected {
-=======
-.tbl .status.is-running {
->>>>>>> 7b19c1312 (web: Create a function to show the service status)
        background-color: var(--color-green);
        color: var(--color-green-invert);
 }
 
-<<<<<<< HEAD
 .tbl .status.is-stopped, .tbl .status.is-disconnected {
-=======
-.tbl .status.is-stopped {
->>>>>>> 7b19c1312 (web: Create a function to show the service status)
        background-color: var(--color-red);
        color: var(--color-red-invert);
 }
@@ -528,7 +511,6 @@ table.form tr.action td form {
        width: 33%;
 }
 
-<<<<<<< HEAD
 .tbl .status.is-connecting {
        background-color: var(--color-orange);
        color: var(--color-orange-invert);
@@ -600,6 +582,8 @@ table.form tr.action td form {
 
 =======
 >>>>>>> 7b19c1312 (web: Create a function to show the service status)
+=======
+>>>>>>> 1829cd5c9 (vulnerabilities.cgi: Use CSS to colour the table)
 table.fw-nat tbody tr td {
        height: 2.25em;
 }