Layout bugfixes

10 files changed, 34 insertions, 24 deletions

diff --git a/src/main/assets/style.css b/src/main/assets/style.css
index f67e2c7d..14a72377 100644
--- a/src/main/assets/style.css
+++ b/src/main/assets/style.css
@@ -219,7 +219,6 @@ pre::selection {
 
 #ctitle a {
     padding: 2px 20px;
-    border-bottom: 2px solid transparent;
     text-overflow: ellipsis;
     overflow: hidden;
 }
@@ -228,16 +227,19 @@ pre::selection {
     border-bottom: 2px solid transparent;
 }
 
-#header_wrapper a.active {
-    background: var(background-color);
+#global a.active {
+    background: var(--background-color);
     border-bottom: 2px solid #ff339a;
     pointer-events: none;
 }
 #global a:hover:not(.active),
-#ctitle a:hover:not(.active),
+#ctitle a:hover,
 .l a:hover {
-    border-bottom: 2px solid #ff339a;
     cursor: pointer;
+    background-color: var(--background-color);
+}
+#global a:hover:not(.active) {
+    border-bottom: 2px solid #ff339a;
 }
 
 #search input {
@@ -361,10 +363,18 @@ article {
     background: var(--text-background-color);
     border: 1px solid var(--border-color);
     line-height: 140%;
-    margin-bottom: 10px;
-    padding: 20px;
+    margin-bottom: 10px;    
     overflow: auto;
 }
+article .h,
+article #postmsg,
+.page-content,
+.msg-cont .msg-comment,
+.msg-cont .msg-recomms,
+.msg-cont .msg-links,
+.msg-cont .msg-header {
+    padding: 20px;
+}
 
 article time {
     color: #88958d;
@@ -434,7 +444,11 @@ article .tags > a::before,
 }
 
 .l .msg-button {
-    padding-top: 12px;
+    padding: 12px;
+}
+.l .msg-button-icon {
+    display: flex;
+    align-items: center;
 }
 
 .Button {
@@ -448,7 +462,6 @@ article .tags > a::before,
 }
 .Button:hover {
     background: #f8f8f8;
-    border-bottom: 1px solid #ff339a;
 }
 
 .msgthread {
@@ -473,7 +486,6 @@ article .tags > a::before,
     border: 1px solid var(--border-color);
     line-height: 140%;
     margin-bottom: 12px;
-    padding: 20px;
 }
 
 .reply-new .msg-cont {
@@ -492,7 +504,7 @@ article .tags > a::before,
 .msg-txt {
     clear: both;
     margin: 0 0 12px;
-    padding-top: 10px;
+    padding: 0 20px;
     word-wrap: break-word;
     overflow-wrap: break-word;
 }
@@ -525,7 +537,6 @@ article .tags > a::before,
 .msg-comment {
     display: flex;
     width: 100%;
-    margin-top: 10px;
     flex-direction: row;
 }
 
@@ -873,14 +884,14 @@ blockquote {
 }
 
 .icon {
-    margin-top: -4px;
     vertical-align: middle;
 }
 
 .newmessage {
     /* textarea on the /post page */
     border: 1px solid #DDD;
-    padding: 2px;
+    outline: none !important;
+    padding: 4px;
     resize: none;
     overflow: auto;
     width: 100%;
@@ -914,7 +925,6 @@ fieldset {
     align-items: center;
     justify-content: center;
     padding: 0;
-    margin: 30px -3px 15px -3px;
     position: relative;
 }
 .embedContainer > * {
diff --git a/src/main/resources/templates/views/404.html b/src/main/resources/templates/views/404.html
index 02a790e6..d3a2367e 100644
--- a/src/main/resources/templates/views/404.html
+++ b/src/main/resources/templates/views/404.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-    <article>
+    <article class="page-content">
         <h1>Страница не найдена</h1>
         <p>Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.</p>
     </article>
diff --git a/src/main/resources/templates/views/help.html b/src/main/resources/templates/views/help.html
index 169ccb3f..5b16cf6e 100644
--- a/src/main/resources/templates/views/help.html
+++ b/src/main/resources/templates/views/help.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-<article>
+<article class="page-content">
     {{ content | raw }}
 </article>
 {% endblock %}
diff --git a/src/main/resources/templates/views/settings_about.html b/src/main/resources/templates/views/settings_about.html
index ea906e0c..274e2c7c 100644
--- a/src/main/resources/templates/views/settings_about.html
+++ b/src/main/resources/templates/views/settings_about.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-<article>
+<article class="page-content">
     <form action="/settings" method="POST" enctype="multipart/form-data">
         <p>Full name: <input type="text" name="fullname" value="{{ userinfo.fullName }}"/></p>
         <p>Country: <input type="text" name="country" value="{{ userinfo.country }}"/></p>
diff --git a/src/main/resources/templates/views/settings_auth-email.html b/src/main/resources/templates/views/settings_auth-email.html
index e906d704..b7b46687 100644
--- a/src/main/resources/templates/views/settings_auth-email.html
+++ b/src/main/resources/templates/views/settings_auth-email.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-<article>
+<article class="page-content">
     <p>{{ result }}</p><p><a href="/settings">Settings</a>.</p>
 </article>
 {% endblock %}
diff --git a/src/main/resources/templates/views/settings_main.html b/src/main/resources/templates/views/settings_main.html
index 090d64a2..8937f507 100644
--- a/src/main/resources/templates/views/settings_main.html
+++ b/src/main/resources/templates/views/settings_main.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-<article>
+<article class="page-content">
     <h1>Settings</h1>
     {%if not visitor.verified %}
     <h2 style="color: red; padding: 20px;">Verify your account by adding email or social account</h2>
diff --git a/src/main/resources/templates/views/settings_password.html b/src/main/resources/templates/views/settings_password.html
index 4a9c403a..91ac08d5 100644
--- a/src/main/resources/templates/views/settings_password.html
+++ b/src/main/resources/templates/views/settings_password.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-<article>
+<article class="page-content">
     <fieldset>
         <legend>Changing your password</legend>
         <form action="/settings" method="post">
diff --git a/src/main/resources/templates/views/settings_privacy.html b/src/main/resources/templates/views/settings_privacy.html
index 83b87b93..20612b8b 100644
--- a/src/main/resources/templates/views/settings_privacy.html
+++ b/src/main/resources/templates/views/settings_privacy.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-<article>
+<article class="page-content">
     <p>Privacy</p>
 </article>
 {% endblock %}
diff --git a/src/main/resources/templates/views/settings_result.html b/src/main/resources/templates/views/settings_result.html
index d87a5ea6..d6d05986 100644
--- a/src/main/resources/templates/views/settings_result.html
+++ b/src/main/resources/templates/views/settings_result.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-<article>
+<article class="page-content">
     <p>{{ result | raw }}</p>
 </article>
 {% endblock %}
diff --git a/src/main/resources/templates/views/signup_result.html b/src/main/resources/templates/views/signup_result.html
index b204e1b8..fcdda020 100644
--- a/src/main/resources/templates/views/signup_result.html
+++ b/src/main/resources/templates/views/signup_result.html
@@ -1,6 +1,6 @@
 {% extends "layouts/default" %}
 {% block content %}
-<article>
+<article class="page-content">
     <p>{{ result | raw }}</p>
 </article>
 {% endblock %}
\ No newline at end of file