From 27b8d25d53e1087d9c74097ffdcb910dd5eb9f5f Mon Sep 17 00:00:00 2001 From: Valentina Demianova <8947@ngs.ru> Date: Mon, 5 Oct 2020 22:34:24 +0700 Subject: [PATCH] chore: keep the footer at the bottom Fix #1204 --- src/main/config/nginx/503.en.html | 13 +++++++++++-- src/main/config/nginx/503.ru.html | 13 +++++++++++-- .../ru/mystamps/web/feature/site/ResourceUrl.java | 2 +- src/main/webapp/WEB-INF/static/styles/main.css | 9 +++++++++ src/main/webapp/WEB-INF/views/account/activate.html | 4 ++-- src/main/webapp/WEB-INF/views/account/auth.html | 4 ++-- src/main/webapp/WEB-INF/views/account/register.html | 4 ++-- src/main/webapp/WEB-INF/views/category/add.html | 4 ++-- src/main/webapp/WEB-INF/views/category/info.html | 4 ++-- src/main/webapp/WEB-INF/views/category/list.html | 4 ++-- src/main/webapp/WEB-INF/views/country/add.html | 4 ++-- src/main/webapp/WEB-INF/views/country/info.html | 4 ++-- src/main/webapp/WEB-INF/views/country/list.html | 4 ++-- .../webapp/WEB-INF/views/error/status-code.html | 4 ++-- src/main/webapp/WEB-INF/views/participant/add.html | 4 ++-- src/main/webapp/WEB-INF/views/series/add.html | 4 ++-- .../webapp/WEB-INF/views/series/import/list.html | 4 ++-- .../webapp/WEB-INF/views/series/import/request.html | 4 ++-- 18 files changed, 60 insertions(+), 33 deletions(-) diff --git a/src/main/config/nginx/503.en.html b/src/main/config/nginx/503.en.html index 436c29ff12..1e5d753045 100644 --- a/src/main/config/nginx/503.en.html +++ b/src/main/config/nginx/503.en.html @@ -40,6 +40,15 @@ #content { padding: 10px; } + + .container-fluid { + display: flex; + min-height: 100vh; + flex-direction: column; + } + #content { + flex-grow: 1; + } @@ -50,8 +59,8 @@ -
-
+
+

503

diff --git a/src/main/config/nginx/503.ru.html b/src/main/config/nginx/503.ru.html index 1d6b2a2bd6..845f27a02b 100644 --- a/src/main/config/nginx/503.ru.html +++ b/src/main/config/nginx/503.ru.html @@ -40,6 +40,15 @@ #content { padding: 10px; } + + .container-fluid { + display: flex; + min-height: 100vh; + flex-direction: column; + } + #content { + flex-grow: 1; + } @@ -50,8 +59,8 @@
-
-
+
+

503

diff --git a/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java b/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java index 8780b8c616..39851cd8c4 100644 --- a/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java +++ b/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java @@ -32,7 +32,7 @@ public final class ResourceUrl { public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru"; // MUST be updated when any of our resources were modified - public static final String RESOURCES_VERSION = "v0.4.4.4"; + public static final String RESOURCES_VERSION = "v0.4.4.5"; // CheckStyle: ignore LineLength for next 16 lines private static final String CATALOG_UTILS_JS = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js"; diff --git a/src/main/webapp/WEB-INF/static/styles/main.css b/src/main/webapp/WEB-INF/static/styles/main.css index 449a0c3855..aa53619f73 100644 --- a/src/main/webapp/WEB-INF/static/styles/main.css +++ b/src/main/webapp/WEB-INF/static/styles/main.css @@ -131,3 +131,12 @@ label { left: 10px; background-color: black; } + +.container-fluid { + display: flex; + min-height: 100vh; + flex-direction: column; +} +#content { + flex-grow: 1; +} diff --git a/src/main/webapp/WEB-INF/views/account/activate.html b/src/main/webapp/WEB-INF/views/account/activate.html index 4c57f12541..9a3da9624e 100644 --- a/src/main/webapp/WEB-INF/views/account/activate.html +++ b/src/main/webapp/WEB-INF/views/account/activate.html @@ -59,8 +59,8 @@
-
-
+
+

Account activation diff --git a/src/main/webapp/WEB-INF/views/account/auth.html b/src/main/webapp/WEB-INF/views/account/auth.html index 14711881f4..82a5d6e449 100644 --- a/src/main/webapp/WEB-INF/views/account/auth.html +++ b/src/main/webapp/WEB-INF/views/account/auth.html @@ -59,8 +59,8 @@

-
-
+
+

Authentication on site diff --git a/src/main/webapp/WEB-INF/views/account/register.html b/src/main/webapp/WEB-INF/views/account/register.html index 71718c2396..157b301b33 100644 --- a/src/main/webapp/WEB-INF/views/account/register.html +++ b/src/main/webapp/WEB-INF/views/account/register.html @@ -59,8 +59,8 @@

-
-
+
+

Register on site diff --git a/src/main/webapp/WEB-INF/views/category/add.html b/src/main/webapp/WEB-INF/views/category/add.html index ec86fcb149..77b1749e23 100644 --- a/src/main/webapp/WEB-INF/views/category/add.html +++ b/src/main/webapp/WEB-INF/views/category/add.html @@ -59,8 +59,8 @@

-
-
+
+

Add category

diff --git a/src/main/webapp/WEB-INF/views/category/info.html b/src/main/webapp/WEB-INF/views/category/info.html index c11b56cfae..8544a08bcd 100644 --- a/src/main/webapp/WEB-INF/views/category/info.html +++ b/src/main/webapp/WEB-INF/views/category/info.html @@ -62,8 +62,8 @@
-
-
+
+

Animals

diff --git a/src/main/webapp/WEB-INF/views/category/list.html b/src/main/webapp/WEB-INF/views/category/list.html index ec816f4af3..64c8c5972e 100644 --- a/src/main/webapp/WEB-INF/views/category/list.html +++ b/src/main/webapp/WEB-INF/views/category/list.html @@ -58,8 +58,8 @@
-
-
+
+

Categories

diff --git a/src/main/webapp/WEB-INF/views/country/add.html b/src/main/webapp/WEB-INF/views/country/add.html index dfa80dd8ba..1792163fe5 100644 --- a/src/main/webapp/WEB-INF/views/country/add.html +++ b/src/main/webapp/WEB-INF/views/country/add.html @@ -59,8 +59,8 @@
-
-
+
+

Add country

diff --git a/src/main/webapp/WEB-INF/views/country/info.html b/src/main/webapp/WEB-INF/views/country/info.html index fbc2984d18..f3de877d39 100644 --- a/src/main/webapp/WEB-INF/views/country/info.html +++ b/src/main/webapp/WEB-INF/views/country/info.html @@ -61,8 +61,8 @@
-
-
+
+

Stamps of Italy

diff --git a/src/main/webapp/WEB-INF/views/country/list.html b/src/main/webapp/WEB-INF/views/country/list.html index 1bda1c9260..03f4901946 100644 --- a/src/main/webapp/WEB-INF/views/country/list.html +++ b/src/main/webapp/WEB-INF/views/country/list.html @@ -58,8 +58,8 @@
-
-
+
+

Countries

diff --git a/src/main/webapp/WEB-INF/views/error/status-code.html b/src/main/webapp/WEB-INF/views/error/status-code.html index b90fd9a4ec..5ba4c04a94 100644 --- a/src/main/webapp/WEB-INF/views/error/status-code.html +++ b/src/main/webapp/WEB-INF/views/error/status-code.html @@ -57,8 +57,8 @@
-
-
+
+

500

diff --git a/src/main/webapp/WEB-INF/views/participant/add.html b/src/main/webapp/WEB-INF/views/participant/add.html index 4cc756943a..a577524056 100644 --- a/src/main/webapp/WEB-INF/views/participant/add.html +++ b/src/main/webapp/WEB-INF/views/participant/add.html @@ -59,8 +59,8 @@
-
-
+
+

Add buyer/seller

diff --git a/src/main/webapp/WEB-INF/views/series/add.html b/src/main/webapp/WEB-INF/views/series/add.html index 50df00928c..4bca3381de 100644 --- a/src/main/webapp/WEB-INF/views/series/add.html +++ b/src/main/webapp/WEB-INF/views/series/add.html @@ -63,8 +63,8 @@
-
-
+
+

Add stamp series

diff --git a/src/main/webapp/WEB-INF/views/series/import/list.html b/src/main/webapp/WEB-INF/views/series/import/list.html index fb081e0c5a..7c19c1613b 100644 --- a/src/main/webapp/WEB-INF/views/series/import/list.html +++ b/src/main/webapp/WEB-INF/views/series/import/list.html @@ -59,8 +59,8 @@
-
-
+
+

Import requests

diff --git a/src/main/webapp/WEB-INF/views/series/import/request.html b/src/main/webapp/WEB-INF/views/series/import/request.html index a3cac30874..99e464b6e8 100644 --- a/src/main/webapp/WEB-INF/views/series/import/request.html +++ b/src/main/webapp/WEB-INF/views/series/import/request.html @@ -59,8 +59,8 @@
-
-
+
+

Import a series