Skip to content

Keep the footer at the bottom #1468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 27, 2020
Merged

Keep the footer at the bottom #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/main/config/nginx/503.en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@
#content {
padding: 10px;
}

.container-fluid {
display: flex;
min-height: 100vh;
flex-direction: column;
}
#content {
flex-grow: 1;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and in other places: we should add this property into the existing section above.

}
</style>
</head>
<body>
Expand All @@ -50,8 +59,8 @@
</div>
</div>

<div class="row text-center">
<div id="content" class="col-sm-12">
<div class="row text-center" id="content">
<div class="col-sm-12">
<h1 id="error-code">
503
</h1>
Expand Down
13 changes: 11 additions & 2 deletions src/main/config/nginx/503.ru.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@
#content {
padding: 10px;
}

.container-fluid {
display: flex;
min-height: 100vh;
flex-direction: column;
}
#content {
flex-grow: 1;
}
</style>
</head>
<body>
Expand All @@ -50,8 +59,8 @@
</div>
</div>

<div class="row text-center">
<div id="content" class="col-sm-12">
<div class="row text-center" id="content">
<div class="col-sm-12">
<h1 id="error-code">
503
</h1>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
9 changes: 9 additions & 0 deletions src/main/webapp/WEB-INF/static/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,12 @@ label {
left: 10px;
background-color: black;
}

.container-fluid {
display: flex;
min-height: 100vh;
flex-direction: column;
}
#content {
flex-grow: 1;
}
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/account/activate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-6 col-sm-offset-3">
<div class="row" id="content">
<div class="col-sm-6 col-sm-offset-3">

<h3 th:text="#{t_activation_on_site}">
Account activation
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/account/auth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-6 col-sm-offset-3" th:with="requestFailed=${(#httpServletRequest.queryString ?: '') eq 'failed'}">
<div class="row" id="content">
<div class="col-sm-6 col-sm-offset-3" th:with="requestFailed=${(#httpServletRequest.queryString ?: '') eq 'failed'}">

<h3 th:text="#{t_authentication_on_site}">
Authentication on site
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/account/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-6 col-sm-offset-3">
<div class="row" id="content">
<div class="col-sm-6 col-sm-offset-3">

<h3 th:text="#{t_registration_on_site}">
Register on site
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/category/add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-6 col-sm-offset-3" th:with="create_category=#{t_create_category}">
<div class="row" id="content">
<div class="col-sm-6 col-sm-offset-3" th:with="create_category=#{t_create_category}">
<h3 th:text="${#strings.capitalize(create_category)}">
Add category
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/category/info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-12">
<div class="row" id="content">
<div class="col-sm-12">
<h3 id="page-header" th:text="${categoryName}">
Animals
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/category/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-12" th:with="category_list=#{t_categories}">
<div class="row" id="content">
<div class="col-sm-12" th:with="category_list=#{t_categories}">
<h3 th:text="${#strings.capitalize(category_list)}">
Categories
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/country/add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-6 col-sm-offset-3" th:with="add_country=#{t_add_country}">
<div class="row" id="content">
<div class="col-sm-6 col-sm-offset-3" th:with="add_country=#{t_add_country}">
<h3 th:text="${#strings.capitalize(add_country)}">
Add country
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/country/info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-12" th:with="header=#{t_stamps_of(${countryName})}">
<div class="row" id="content">
<div class="col-sm-12" th:with="header=#{t_stamps_of(${countryName})}">
<h3 id="page-header" th:text="${#strings.capitalize(header)}">
Stamps of Italy
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/country/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-12" th:with="country_list=#{t_countries}">
<div class="row" id="content">
<div class="col-sm-12" th:with="country_list=#{t_countries}">
<h3 th:text="${#strings.capitalize(country_list)}">
Countries
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/error/status-code.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
</div>
</div>

<div class="row text-center">
<div id="content" class="col-sm-12">
<div class="row text-center" id="content">
<div class="col-sm-12">
<h1 id="error-code" th:text="${#response.status}">
500
</h1>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/participant/add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-6 col-sm-offset-3" th:with="header=#{t_add_buyer_seller}">
<div class="row" id="content">
<div class="col-sm-6 col-sm-offset-3" th:with="header=#{t_add_buyer_seller}">
<h3 th:text="${#strings.capitalize(header)}">
Add buyer/seller
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/series/add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-6 col-sm-offset-3" th:with="add_series=#{t_add_series}">
<div class="row" id="content">
<div class="col-sm-6 col-sm-offset-3" th:with="add_series=#{t_add_series}">
<h3 th:text="${#strings.capitalize(add_series)}">
Add stamp series
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/series/import/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-10 col-sm-offset-1" th:with="header=#{t_import_requests}">
<div class="row" id="content">
<div class="col-sm-10 col-sm-offset-1" th:with="header=#{t_import_requests}">
<h3 th:text="${#strings.capitalize(header)}">
Import requests
</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/series/import/request.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ul>
</div>
</div>
<div class="row">
<div id="content" class="col-sm-6 col-sm-offset-3" th:with="header=#{t_import_series}">
<div class="row" id="content">
<div class="col-sm-6 col-sm-offset-3" th:with="header=#{t_import_series}">
<h3 th:text="${#strings.capitalize(header)}">
Import a series
</h3>
Expand Down