Merge pull request #49 from belivipro9x99/indev

merge branch indev into master
Belikhun · Mar 5, 2020 · f47e22c · f47e22c
2 parents b6b2f44 + 05591af
commit f47e22c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@ An **beautiful** and **easy-to-use** Web Interface for **[Themis](https://dsapbl
 
 <img src="https://lh3.googleusercontent.com/SYT2hlU7_rxmCgHz0kt6089Md1V-j-ePWUUQBFtUVF5DTlcSjmGhr14J7Qsgx262KBZuhGKZ4eZD3ChYzdBaFMytEw0aBD3dRLi0bZskyK3-6MQ7rMkDMfcED18JgPyfeZEee50h8g=w2400" width="500px">
 
-[![version](https://img.shields.io/badge/rev1-v0.6.0-brightgreen.svg?longCache=true&style=for-the-badge)](https://github.com/belivipro9x99/themis-webinterface/releases/)
+[![version](https://img.shields.io/github/v/tag/belivipro9x99/themis-web-interface?color=brown&label=version&style=for-the-badge)](https://github.com/belivipro9x99/themis-webinterface/releases/)
 [![license](https://img.shields.io/badge/license-MIT-orange.svg?longCache=true&style=for-the-badge)](https://github.com/belivipro9x99/themis-web-interface/blob/master/LICENSE)
 [![status](https://img.shields.io/badge/status-near_stable-blue.svg?longCache=true&style=for-the-badge)]()
 [![Travis CI Build Status](https://img.shields.io/travis/belivipro9x99/themis-web-interface.svg?style=for-the-badge)](https://travis-ci.org/belivipro9x99/themis-web-interface)
-[![codefactor](https://www.codefactor.io/repository/github/belivipro9x99/themis-web-interface/badge/release?style=for-the-badge)](https://www.codefactor.io/repository/github/belivipro9x99/themis-web-interface)
+[![codefactor](https://www.codefactor.io/repository/github/belivipro9x99/themis-web-interface/badge/master?style=for-the-badge)](https://www.codefactor.io/repository/github/belivipro9x99/themis-web-interface)
 
 [![Travis CI Build Status](https://img.shields.io/travis/belivipro9x99/themis-web-interface/master.svg?label=master&style=for-the-badge)](https://travis-ci.org/belivipro9x99/themis-web-interface)
 [![Travis CI Build Status](https://img.shields.io/travis/belivipro9x99/themis-web-interface/indev.svg?label=indev&style=for-the-badge)](https://travis-ci.org/belivipro9x99/themis-web-interface)

diff --git a/assets/css/core.css b/assets/css/core.css
@@ -266,6 +266,7 @@ panel .main .showEmpty:empty::after {
 
 #logp {
     flex-grow: 1;
+    height: calc(100% - 220px);
 }
 
 #rankp {
@@ -304,7 +305,8 @@ panel .main .showEmpty:empty::after {
     }
 
     #logp {
-        max-height: 100%;
+        height: auto;
+        max-height: calc(100vh - 90px);
     }
 }
 

diff --git a/assets/css/splash.css b/assets/css/splash.css
@@ -83,7 +83,7 @@
     position: relative;
     display: block;
     text-align: center;
-    margin: 4px auto 22px;
+    margin: 3px auto 22px;
     color: #40566d;
     font-family: "Open Sans";
     font-size: 11px;

diff --git a/data/info.php b/data/info.php
@@ -10,7 +10,7 @@
 	define("APPNAME", "Themis Web Interface");
 	define("AUTHOR", "Belikhun");
 	define("VERSION", "0.6.0");
-	define("VERSION_TAG", "rev1");
+	define("VERSION_TAG", "rev2");
 	define("REPO_ADDRESS", "https://github.com/belivipro9x99/themis-web-interface");
 	define("REPORT_ERROR", REPO_ADDRESS . "/issues");
 	define("CONTACT_LINK", "http://m.me/belivipro9x99");