From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Mar 2024 18:00:49 +0000 (+0100)
Subject: CSS: Automatically stripe all tables
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea43b204f707da31da35c47ea01094d0e9a5933e;p=people%2Fms%2Fipfire-2.x.git

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 fafa51f60..45cd572a8 100644
--- 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;