From 249133204eced0f2f66f160bc1edb3f448d64ade Mon Sep 17 00:00:00 2001
From: Eugene Molotov <eugene.molotov@yandex.ru>
Date: Fri, 24 Mar 2023 17:44:34 +0500
Subject: [PATCH] [UI] Remove excessive top margin in all pages and logo in
 HTML feed preview (#3326)

---
 static/style.css               | 3 +--
 templates/base.html.php        | 2 +-
 templates/html-format.html.php | 8 +-------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/static/style.css b/static/style.css
index 1517e19e..570ee014 100644
--- a/static/style.css
+++ b/static/style.css
@@ -66,7 +66,6 @@ p {
 
 /* Header */
 header {
-    margin-top: 40px;
     padding: 15px;
     color: #1182DB;
     text-align: center;
@@ -133,7 +132,7 @@ input:focus:-ms-input-placeholder { opacity: 0; }
 
 .container {
     width: 60%;
-    margin: 30px auto;
+    margin: 0 auto 30px auto;
 }
 
 /* Section */
diff --git a/templates/base.html.php b/templates/base.html.php
index 8a3dc6d5..00728785 100644
--- a/templates/base.html.php
+++ b/templates/base.html.php
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="RSS-Bridge" />
     <title><?= e($_title ?? 'RSS-Bridge') ?></title>
-    <link href="static/style.css" rel="stylesheet">
+    <link href="static/style.css?2023-03-24" rel="stylesheet">
     <link rel="icon" type="image/png" href="static/favicon.png">
 </head>
 
diff --git a/templates/html-format.html.php b/templates/html-format.html.php
index d6fbda26..3a384deb 100644
--- a/templates/html-format.html.php
+++ b/templates/html-format.html.php
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/ >
     <meta name="description" content="RSS-Bridge" />
     <title><?= e($title) ?></title>
-    <link href="static/style.css" rel="stylesheet">
+    <link href="static/style.css?2023-03-24" rel="stylesheet">
     <link rel="icon" type="image/png" href="static/favicon.png">
 
 	<?php foreach ($linkTags as $link): ?>
@@ -24,12 +24,6 @@
 
     <div class="container">
 
-        <header>
-            <a href="./">
-                <img width="400" src="static/logo_600px.png">
-            </a>
-        </header>
-
         <h1 class="pagetitle">
             <a href="<?= e($uri) ?>" target="_blank"><?= e($title) ?></a>
         </h1>