nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add white Card

Browse Source 
This puts pages on white cards.
This lets the footer float underneath content instead of bottom of the page.
This should fix issues with MR !1335

Reviewed-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
This commit is contained in:
Robert Martinez 2018-10-19 11:50:01 +02:00 committed by Joseph Nuthalapati
parent 0f70bb32de
commit 966b2cb36a
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plinth/modules/help/templates/help_index.html
View File

@ -23,7 +23,7 @@
{% load static %} {% load static %}
{% block content %} {% block content %}
<div id="container-wrapper" class="container thumbnail">
<h2>{% trans "Help" %}</h2> <h2>{% trans "Help" %}</h2>
<p> <p>
@ -59,7 +59,7 @@
#freedombox</a> channel using the IRC web interface. #freedombox</a> channel using the IRC web interface.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
</div>
{% endblock %} {% endblock %}

7
plinth/templates/base.html
View File

@ -219,10 +219,8 @@
</div> </div>
{% block container %} {% block container %}
<div id="container-wrapper" class="container"> <div id="container-wrapper" class="container thumbnail">
<div class="row">
{% block content_row %} {% block content_row %}
<div class="col-md-8 col-md-offset-2">
{% block subsubmenu %} {% block subsubmenu %}
{% if subsubmenu %} {% if subsubmenu %}
{% show_subsubmenu subsubmenu %} {% show_subsubmenu subsubmenu %}
@ -234,14 +232,11 @@
{% block content %} {% block content %}
{# main content goes here #} {# main content goes here #}
{% endblock %} {% endblock %}
</div>
{% endblock %} {% endblock %}
</div>
</div> </div>
{% endblock %} {% endblock %}
<footer> <footer>
<hr>
<div class="container"> <div class="container">
{% block footer_block %} {% block footer_block %}
<div class="license-info"> <div class="license-info">

6
plinth/templates/cards.html
View File

@ -55,13 +55,11 @@
</div> </div>
<div id="container-wrapper" class="container"> <div id="container-wrapper" class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
{% block content %} {% block content %}
{# main content goes here #} {# main content goes here #}
{% endblock %} {% endblock %}
</div>
</div>
</div> </div>
{% endblock %} {% endblock %}

15
static/themes/default/css/plinth.css
View File

@ -150,7 +150,9 @@ body {
/* Sticky footer styles /* Sticky footer styles
-------------------------------------------------- */ -------------------------------------------------- */
footer .license-info { footer .license-info {
opacity: 0.75; opacity: 0.5;
margin-right: 20px;
text-align: right;
} }
.footer-logo { .footer-logo {
@ -175,14 +177,13 @@ html {
max-width: 1000px; max-width: 1000px;
} }
#container-wrapper { .container.thumbnail {
/*covers for footer height */ padding: 5px 50px 50px;
padding-bottom: 150px;
} }
footer { footer {
text-align: center; text-align: center;
position: absolute; position: relative;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 150px; height: 150px;
@ -374,6 +375,10 @@ a.menu_link_active {
font-size: 80px; font-size: 80px;
} }
.container.thumbnail {
padding: 5px 50px 50px;
}
/* Button table - Tables with a list of actions as buttons on top */ /* Button table - Tables with a list of actions as buttons on top */
.button-table > .button-row + .table { .button-table > .button-row + .table {
margin-top: 10px; margin-top: 10px;