CSS: Automatically stripe all tables

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 fafa51f60fb06cbdefb97174223f676aa9373fae..45cd572a847be3de90e00ab418d1bb2d28f86789 100644 (file)
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -1,4 +1,5 @@
 :root {
+<<<<<<< HEAD
        --color-green          : #339933;
        --color-green-invert   : #ffffff;
        --color-red            : #993333;
@@ -17,6 +18,14 @@
        --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 */
@@ -410,7 +419,6 @@ table.form tr.action td form {
        text-align: left;
 }
 
-<<<<<<< HEAD
 .tbl tr:nth-child(odd) td {
        background-color: var(--color-grey);
 }
@@ -436,6 +444,8 @@ table.form tr.action td form {
 
 =======
 >>>>>>> 7b19c1312 (web: Create a function to show the service status)
+=======
+>>>>>>> 17ed2e345 (CSS: Automatically stripe all tables)
 .tbl th:first-child {
        border-left: 1px solid #363636;
        border-top: 1px solid #363636;