Skip to content

Commit 9a4fc32

Browse files
committed
add margins and fix of the footer layout
1 parent 54b9a07 commit 9a4fc32

2 files changed

Lines changed: 17 additions & 14 deletions

File tree

apps/commons/static/commons/css/base.scss

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,18 @@ body {
3131
.content-page {
3232
max-width: 59rem;
3333
min-height: calc(100vh - #{$navbar-height} - #{$footer-height} + 1px);
34-
padding: 2rem 0rem 5rem 0rem;
34+
padding: 2rem 1.2rem 5rem 1.2rem;
3535

3636
@include from($custom-mobile) {
3737
& > .box {
3838
padding: 2rem;
3939
}
4040
}
4141

42+
@include from($desktop){
43+
padding: 2rem 0rem 5rem 0rem;
44+
}
45+
4246
&.is-wide {
4347
max-width: 80rem;
4448
}
@@ -47,10 +51,13 @@ body {
4751
max-width: 47rem;
4852
}
4953
}
50-
54+
/
55+
5156
.footer-page {
5257
background-color: $footer-bg;
5358
position: relative;
59+
margin-top: 2em;
60+
padding: 1.5em 1.5em 2.2em 1.5em;
5461

5562
a {
5663
color: $footer-fg;
@@ -63,22 +70,14 @@ body {
6370
.footer-column {
6471
color: #ebebeb;
6572
padding-top: 2rem;
66-
padding-bottom: 0.5rem;
67-
68-
@include from($desktop) {
69-
padding-top: 2rem;
70-
padding-bottom: 3rem;
71-
}
73+
7274
}
7375

7476
h1,
7577
h2 {
7678
color: whitesmoke;
7779
}
7880

79-
i {
80-
padding-right: 0.2rem;
81-
}
8281
}
8382

8483
/* Error class for Django Forms https://bit.ly/3vidyK2 */

apps/commons/templates/footer.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% load utils %}
2-
<footer class="footer-page has-text-centered" style="margin-top: 4em;">
2+
<footer class="footer-page has-text-centered">
33
<a class="footer-button" id="scrollToTopBtn" href=""
44
><img
55
class="footer__button--image"
@@ -8,7 +8,7 @@
88
titile="scroll button up"
99
/></a>
1010
<div class="columns">
11-
<div class="column has-text-weight-light">
11+
<div class="column has-text-weight-light is-one-third-desktop">
1212
<div class="footer-column">
1313
<h2 class="subtitle"><i class="fas fa-award"></i> Créditos</h2>
1414
<ul class="footer-column-items">
@@ -23,7 +23,11 @@ <h2 class="subtitle"><i class="fas fa-award"></i> Créditos</h2>
2323
<div class="footer-column">
2424
<h2 class="subtitle"><i class="fas fa-copyright"></i> {{ organization.name }}</h2>
2525
<ul class="footer-column-items">
26-
<li>{{ organization.full_address }}</li>
26+
<li>{{ organization.address }}</li>
27+
{% if organization.rest_address %}
28+
<li>{{ organization.rest_address }}</li>
29+
{% endif %}
30+
<li>{{ organization.postal_code }}, {{ organization.city }}</li>
2731
<li><a href="mailto:{{ organization.email }}">{{ organization.email }}</a></li>
2832
<li><a href="{% url 'about:index' %}">Sobre la asociación</a></li>
2933
</ul>

0 commit comments

Comments
 (0)