diff options
Diffstat (limited to 'src/main')
5 files changed, 8 insertions, 19 deletions
diff --git a/src/main/assets/style.css b/src/main/assets/style.css index 7e95eae1..a409ea36 100644 --- a/src/main/assets/style.css +++ b/src/main/assets/style.css @@ -141,9 +141,8 @@ pre::-moz-selection { background: var(--main-background-color); } -#content { +#content_wrapper { margin-top: 66px; - padding-bottom: 66px; } #minimal_content { @@ -178,16 +177,10 @@ pre::-moz-selection { flex-wrap: wrap; } -.header--hidden { - transform: translateY(-100%); -} - #footer { color: #999; font-size: 10pt; padding: 10px 0; - display: flex; - flex-direction: column; } /* #endregion */ @@ -1004,7 +997,6 @@ article p { #column { position: sticky; padding: 12px; - margin-top: 66px; height: 100%; z-index: auto; overflow-y: auto; @@ -1019,6 +1011,8 @@ article p { width: 300px; overflow-y: auto; height: 100%; + display: flex; + flex-direction: column; } #header_wrapper, #content_wrapper { @@ -1027,6 +1021,7 @@ article p { } #content_wrapper { display: flex; + margin: 66px auto 0; } #footer { padding: 10px; diff --git a/src/main/resources/templates/views/partial/footer.html b/src/main/resources/templates/views/partial/footer.html index 671b9b6a..e69000f7 100644 --- a/src/main/resources/templates/views/partial/footer.html +++ b/src/main/resources/templates/views/partial/footer.html @@ -1,4 +1,4 @@ -<div id="footer"> +<div id="footer" class="desktop"> <div id="footer-left">juick.com © 2008-2020 {% if links | default ('') is not empty %} <br/>{{ i18n("messages","label.sponsors") }}: {{ links | raw }} diff --git a/src/main/resources/templates/views/partial/homecolumn.html b/src/main/resources/templates/views/partial/homecolumn.html index 6f92f8ba..a4cca153 100644 --- a/src/main/resources/templates/views/partial/homecolumn.html +++ b/src/main/resources/templates/views/partial/homecolumn.html @@ -22,6 +22,4 @@ </a> {% endif %} </div> -<span class="desktop"> - {% include "views/partial/footer" %} -</span>
\ No newline at end of file +{% include "views/partial/footer" %}
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/tagcolumn.html b/src/main/resources/templates/views/partial/tagcolumn.html index 4d8ad160..a7728ef3 100644 --- a/src/main/resources/templates/views/partial/tagcolumn.html +++ b/src/main/resources/templates/views/partial/tagcolumn.html @@ -23,6 +23,4 @@ {% endif %} </div> {% endif %} -<span class="desktop"> - {% include "views/partial/footer" %} -</span>
\ No newline at end of file +{% include "views/partial/footer" %}
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/usercolumn.html b/src/main/resources/templates/views/partial/usercolumn.html index 06ad647d..e55614b2 100644 --- a/src/main/resources/templates/views/partial/usercolumn.html +++ b/src/main/resources/templates/views/partial/usercolumn.html @@ -90,6 +90,4 @@ {% endif %} </div> -<span class="desktop"> - {% include "views/partial/footer" %} -</span>
\ No newline at end of file +{% include "views/partial/footer" %}
\ No newline at end of file |