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 a0636136881b2460ef6485099d07e1d509e4a2ad..00a392ffaf780f9ab7a8a654eb54d0be45248708 100644 (file)
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -389,13 +389,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%;
 }
@@ -436,10 +433,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;
@@ -574,10 +567,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;
 }