Skip to content

Commit 27b8d25

Browse files
demianovademianova
committed
chore: keep the footer at the bottom
Fix #1204
1 parent 1a560d3 commit 27b8d25

File tree

18 files changed

+60
-33
lines changed

18 files changed

+60
-33
lines changed

‎src/main/config/nginx/503.en.html‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@
4040
#content {
4141
padding: 10px;
4242
}
43+
44+
.container-fluid {
45+
display: flex;
46+
min-height: 100vh;
47+
flex-direction: column;
48+
}
49+
#content {
50+
flex-grow: 1;
51+
}
4352
</style>
4453
</head>
4554
<body>
@@ -50,8 +59,8 @@
5059
</div>
5160
</div>
5261

53-
<div class="row text-center">
54-
<div id="content" class="col-sm-12">
62+
<div class="row text-center" id="content">
63+
<div class="col-sm-12">
5564
<h1 id="error-code">
5665
503
5766
</h1>

‎src/main/config/nginx/503.ru.html‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@
4040
#content {
4141
padding: 10px;
4242
}
43+
44+
.container-fluid {
45+
display: flex;
46+
min-height: 100vh;
47+
flex-direction: column;
48+
}
49+
#content {
50+
flex-grow: 1;
51+
}
4352
</style>
4453
</head>
4554
<body>
@@ -50,8 +59,8 @@
5059
</div>
5160
</div>
5261

53-
<div class="row text-center">
54-
<div id="content" class="col-sm-12">
62+
<div class="row text-center" id="content">
63+
<div class="col-sm-12">
5564
<h1 id="error-code">
5665
503
5766
</h1>

‎src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public final class ResourceUrl {
3232
public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
3333

3434
// MUST be updated when any of our resources were modified
35-
public static final String RESOURCES_VERSION = "v0.4.4.4";
35+
public static final String RESOURCES_VERSION = "v0.4.4.5";
3636

3737
// CheckStyle: ignore LineLength for next 16 lines
3838
private static final String CATALOG_UTILS_JS = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";

‎src/main/webapp/WEB-INF/static/styles/main.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,12 @@ label {
131131
left: 10px;
132132
background-color: black;
133133
}
134+
135+
.container-fluid {
136+
display: flex;
137+
min-height: 100vh;
138+
flex-direction: column;
139+
}
140+
#content {
141+
flex-grow: 1;
142+
}

‎src/main/webapp/WEB-INF/views/account/activate.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
</ul>
6060
</div>
6161
</div>
62-
<div class="row">
63-
<div id="content" class="col-sm-6 col-sm-offset-3">
62+
<div class="row" id="content">
63+
<div class="col-sm-6 col-sm-offset-3">
6464

6565
<h3 th:text="#{t_activation_on_site}">
6666
Account activation

‎src/main/webapp/WEB-INF/views/account/auth.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
</ul>
6060
</div>
6161
</div>
62-
<div class="row">
63-
<div id="content" class="col-sm-6 col-sm-offset-3" th:with="requestFailed=${(#httpServletRequest.queryString ?: '') eq 'failed'}">
62+
<div class="row" id="content">
63+
<div class="col-sm-6 col-sm-offset-3" th:with="requestFailed=${(#httpServletRequest.queryString ?: '') eq 'failed'}">
6464

6565
<h3 th:text="#{t_authentication_on_site}">
6666
Authentication on site

‎src/main/webapp/WEB-INF/views/account/register.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
</ul>
6060
</div>
6161
</div>
62-
<div class="row">
63-
<div id="content" class="col-sm-6 col-sm-offset-3">
62+
<div class="row" id="content">
63+
<div class="col-sm-6 col-sm-offset-3">
6464

6565
<h3 th:text="#{t_registration_on_site}">
6666
Register on site

‎src/main/webapp/WEB-INF/views/category/add.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
</ul>
6060
</div>
6161
</div>
62-
<div class="row">
63-
<div id="content" class="col-sm-6 col-sm-offset-3" th:with="create_category=#{t_create_category}">
62+
<div class="row" id="content">
63+
<div class="col-sm-6 col-sm-offset-3" th:with="create_category=#{t_create_category}">
6464
<h3 th:text="${#strings.capitalize(create_category)}">
6565
Add category
6666
</h3>

‎src/main/webapp/WEB-INF/views/category/info.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
</ul>
6363
</div>
6464
</div>
65-
<div class="row">
66-
<div id="content" class="col-sm-12">
65+
<div class="row" id="content">
66+
<div class="col-sm-12">
6767
<h3 id="page-header" th:text="${categoryName}">
6868
Animals
6969
</h3>

‎src/main/webapp/WEB-INF/views/category/list.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
</ul>
5959
</div>
6060
</div>
61-
<div class="row">
62-
<div id="content" class="col-sm-12" th:with="category_list=#{t_categories}">
61+
<div class="row" id="content">
62+
<div class="col-sm-12" th:with="category_list=#{t_categories}">
6363
<h3 th:text="${#strings.capitalize(category_list)}">
6464
Categories
6565
</h3>

0 commit comments

Comments
 (0)