From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Apr 2024 17:23:18 +0000 (+0200)
Subject: CSS: Don't make headings so skinny
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94a09669fa842cdd092bac520a965d1549f6497e;p=people%2Fms%2Fipfire-2.x.git

CSS: Don't make headings so skinny

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 10997d2b1..f70bd816b 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -396,13 +396,10 @@ table.form tr.action td {
 	text-align: right;
 }
 
-<<<<<<< HEAD
 table.form tr.action td form {
 	display: inline;
 }
 
-=======
->>>>>>> f3e0bbd58 (ovpnmain.cgi: Redesign the roadwarrior section)
 .tbl {
 	width: 100%;
 }
@@ -443,10 +440,6 @@ table.form tr.action td form {
 	background-color: var(--color-yellow);
 }
 
-=======
->>>>>>> 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;
@@ -583,10 +576,6 @@ table.form tr.action td form {
 	color: var(--color-black-invert);
 }
 
-=======
->>>>>>> 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;
 }