From a9521ab38dbc25d55a792d07940e3fc6c674e50a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 29 Apr 2020 14:55:45 +0300
Subject: Button style

---
 src/main/assets/scripts.js                         |  8 ++++----
 src/main/assets/style.css                          | 24 ++++++++++++++--------
 src/main/resources/templates/views/post.html       |  2 +-
 .../resources/templates/views/settings_main.html   | 18 ++++++++--------
 .../templates/views/settings_password.html         |  2 +-
 5 files changed, 31 insertions(+), 23 deletions(-)

(limited to 'src/main')

diff --git a/src/main/assets/scripts.js b/src/main/assets/scripts.js
index 2c56fe7f..69a5814d 100644
--- a/src/main/assets/scripts.js
+++ b/src/main/assets/scripts.js
@@ -284,7 +284,7 @@ function showCommentForm(mid, rid) {
                         <textarea name="body" rows="1" class="reply" placeholder="${i18n('comment.writeComment')}"></textarea>
                         <div class="attach-photo">${evilIcon('ei-camera')}</div>
                     </div>
-                    <input type="submit" value="OK">
+                    <input type="submit" class="Button" value="OK">
                 </div>
             </form>`;
         formTarget.insertAdjacentHTML('afterend', formHtml);
@@ -428,7 +428,7 @@ function openPostDialog() {
                 <input class="img" name="img" placeholder="${i18n('postForm.imageLink')} (${i18n('postForm.imageFormats')})"/>
                  ${i18n('postForm.or')} <a href="#">${i18n('postForm.upload')}</a><br/>
                 <input id="tags_input" class="tags" name="tags" placeholder="${i18n('postForm.tags')}"/><br/>
-                <input type="submit" class="subm" value="${i18n('postForm.submit')}"/>
+                <input type="submit" class="subm Button" value="${i18n('postForm.submit')}"/>
             </div>
         </form>
     `;
@@ -501,7 +501,7 @@ function openDialogLogin() {
             <form action="/login" method="POST">
                 <input class="signinput" type="text" name="username" placeholder="${i18n('loginDialog.username')}"/><br/>
                 <input class="signinput" type="password" name="password" placeholder="${i18n('loginDialog.password')}"/><br/>
-                <input class="signsubmit" type="submit" value="OK"/>
+                <input class="signsubmit Button" type="submit" value="OK"/>
             </form>
         </div>`;
     openDialog(html);
@@ -643,7 +643,7 @@ ready(function() {
     renderIcons();
     var insertPMButtons = function(e) {
         e.target.classList.add('narrowpm');
-        e.target.parentNode.insertAdjacentHTML('afterend', '<input type="submit" value="OK"/>');
+        e.target.parentNode.insertAdjacentHTML('afterend', '<input type="submit" class="Button" value="OK"/>');
         e.target.removeEventListener('click', insertPMButtons);
         e.preventDefault();
     };
diff --git a/src/main/assets/style.css b/src/main/assets/style.css
index 2ac91e91..96d47930 100644
--- a/src/main/assets/style.css
+++ b/src/main/assets/style.css
@@ -451,6 +451,21 @@ article .tags > a::before,
     padding-top: 12px;
 }
 
+.Button {
+    background: #fff;
+    border: 1px solid var(--border-color);
+    color: #888;
+    cursor: pointer;
+    display: inline-block;
+    margin: 5px;
+    padding: 4px 10px;
+}
+.Button:hover {
+    background: #f8f8f8;
+    border-bottom: 1px solid #ff339a;
+}
+
+
 .msgthread {
     margin-bottom: 0;
 }
@@ -526,7 +541,7 @@ article .tags > a::before,
     display: flex;
     width: 100%;
     margin-top: 10px;
-    flex-direction: column;
+    flex-direction: row;
 }
 
 .msg-comment-hidden {
@@ -980,13 +995,6 @@ article p {
 .msg-comment input {
     align-self: flex-end;
     margin: 6px 0 0 0;
-    background: #EEE;
-    border: 1px solid #CCC;
-    color: #999;
-    position: sticky;
-    top: 70px;
-    vertical-align: top;
-    width: 50px;
 }
 
 @media (--viewport-mobile) {
diff --git a/src/main/resources/templates/views/post.html b/src/main/resources/templates/views/post.html
index aed4f316..8749d9e2 100644
--- a/src/main/resources/templates/views/post.html
+++ b/src/main/resources/templates/views/post.html
@@ -10,7 +10,7 @@
     <p>
         <textarea name="body" class="newmessage" rows="7" cols="10" placeholder="*weather It's very cold today!">{{ body }}</textarea>
         <br/>
-        <input type="submit" class="subm" value="   {{ i18n("messages","postForm.submit") }}   "/>
+        <input type="submit" class="subm Button" value="   {{ i18n("messages","postForm.submit") }}   "/>
     </p>
 </form>
 </article>
diff --git a/src/main/resources/templates/views/settings_main.html b/src/main/resources/templates/views/settings_main.html
index 1179d797..5c809bc1 100644
--- a/src/main/resources/templates/views/settings_main.html
+++ b/src/main/resources/templates/views/settings_main.html
@@ -14,7 +14,7 @@
                       checked="checked" {% endif %}/> Subscriptions notifications (&quot;@user subscribed...&quot;)</p>
             <p><input type="checkbox" name="recomm" value="1" {% if notify_options.recommendationsEnabled %}
                       checked="checked" {% endif %}/> Posts recommendations (&quot;Recommended by @user&quot;)</p>
-            <p><input type="hidden" name="page" value="main"/><input type="submit" value="  OK  "/></p>
+            <p><input type="hidden" name="page" value="main"/><input type="submit" class="Button" value="  OK  "/></p>
         </fieldset>
     </form>
     <fieldset>
@@ -24,7 +24,7 @@
         <form action="/settings" method="post">
             <div>Telegram: <b>{{ telegram_name }}</b> &mdash;
                 <input type="hidden" name="page" value="telegram-del"/>
-                <input type="submit" value="  Disable  "/>
+                <input type="submit" value="  Disable  " class="Button" />
             </div>
         </form>
         {% else %}
@@ -51,7 +51,7 @@
                 {% endfor %}
             </p>
             {% if jids | length > 1 %}
-            <p><input type="hidden" name="page" value="jid-del"/><input type="submit" value="  Delete  "/></p>
+            <p><input type="hidden" name="page" value="jid-del"/><input type="submit" class="Button" value="  Delete  "/></p>
             {% endif %}
             <p>To add new jabber account: send any text message to <a href="xmpp:juick@juick.com?message;body=login">juick@juick.com</a>
             </p>
@@ -66,7 +66,7 @@
             <p>Add account:<br/>
                 <input type="text" name="account"/>
                 <input type="hidden" name="page" value="email-add"/>
-                <input type="submit" value="  Add  "/>
+                <input type="submit" value="  Add  " class="Button" />
             </p>
         </form>
         <form action="/settings" method="POST" enctype="multipart/form-data">
@@ -80,7 +80,7 @@
             {% else %}
             </p>
             {% if jids | length > 1 %}
-            <p><input type="hidden" name="page" value="email-del"/><input type="submit" value="  Delete  "/></p>
+            <p><input type="hidden" name="page" value="email-del"/><input type="submit" class="Button" value="  Delete  "/></p>
             {% endif %}
             {% endif %}
         </form>
@@ -97,7 +97,7 @@
                     {% endfor %}
                 </select>
                 <input type="hidden" name="page" value="email-subscr"/>
-                <input type="submit" value="OK"/></p>
+                <input type="submit" class="Button" value="OK"/></p>
         </form>
         <!--/email_off-->
         {% endif %}
@@ -115,7 +115,7 @@
             <div>
                 Facebook: <b>Enabled</b> &mdash;
                 <input type="hidden" name="page" value="facebook-disable"/>
-                <input type="submit" value="  Disable  "/>
+                <input type="submit" class="Button" value="  Disable  "/>
             </div>
         </form>
         {% else %}
@@ -123,7 +123,7 @@
             <div>
                 Facebook: <b>Disabled</b> &mdash;
                 <input type="hidden" name="page" value="facebook-enable"/>
-                <input type="submit" value="  Enable  "/>
+                <input type="submit" class="Button" value="  Enable  "/>
             </div>
         </form>
         {% endif %}
@@ -138,7 +138,7 @@
     <form action="/settings" method="post">
         <div>Twitter: <b>{{ twitter_name }}</b> &mdash;
             <input type="hidden" name="page" value="twitter-del"/>
-            <input type="submit" value="  Disable  "/>
+            <input type="submit" class="Button" value="  Disable  "/>
         </div>
     </form>
     {% else %}
diff --git a/src/main/resources/templates/views/settings_password.html b/src/main/resources/templates/views/settings_password.html
index aba0b139..99c1676e 100644
--- a/src/main/resources/templates/views/settings_password.html
+++ b/src/main/resources/templates/views/settings_password.html
@@ -5,7 +5,7 @@
         <legend>Changing your password</legend>
         <form action="/settings" method="post">
             <input type="hidden" name="page" value="password"/>
-            <p>Change password: <input type="password" name="password" size="8"/> <input type="submit"
+            <p>Change password: <input type="password" name="password" size="8"/> <input class="Button" type="submit"
                                                                                          value="  Update  "/><br/>
                 <i>(max. length - 16 symbols)</i></p>
         </form>
-- 
cgit v1.2.3