Skip to content

Commit 419ba2b

Browse files
sdelquinsdelquin
authored
Merge pull request #409 from pythoncanarias/406-add-margins-content-footer
fix: add margins to the mobile display and fix of problems of layaout in footer
2 parents 193bea1 + 549cd62 commit 419ba2b

8 files changed

Lines changed: 46 additions & 28 deletions

File tree

‎apps/about/templates/about/join.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
{% block content %}
88

99
<div class="content box">
10+
<div id="join" class="section anchor">
1011

11-
<a id="join"></a>
12-
<h1 class="dyn-anchor-heading">
12+
<h1 class="dyn-anchor-heading" >
1313
No nos mires, ¡únete! <i class="fas fa-people-carry"></i>
1414
<a class="dyn-anchor-link" href="#join"><i class="fas fa-link"></i></a>
1515
</h1>
@@ -31,8 +31,9 @@ <h1 class="dyn-anchor-heading">
3131
<p>Si ya eres socio/a, pulsa en el siguiente botón para aceder:</p>
3232
<a class="button is-link" href="{% url 'members:login' %}">Acceso para socios/as</a>
3333

34-
<a id="fee"></a>
35-
<h2 class="dyn-anchor-heading">
34+
</div>
35+
<div id="fee" class="section anchor">
36+
<h2 class="dyn-anchor-heading ">
3637
Cuota
3738
<a class="dyn-anchor-link" href="#fee"><i class="fas fa-link"></i></a>
3839
</h2>
@@ -42,9 +43,9 @@ <h2 class="dyn-anchor-heading">
4243
<li><span class="tag is-info is-medium">20€</span> Importe general.</li>
4344
<li><span class="tag is-primary is-medium">10€</span> Estudiantes y/o personas desempleadas.</li>
4445
</ul>
45-
46-
<a id="method"></a>
47-
<h2 class="dyn-anchor-heading">
46+
</div>
47+
<div id="method" class="section anchor">
48+
<h2 class="dyn-anchor-heading ">
4849
Procedimiento para convertirse/renovar como socio/socia
4950
<a class="dyn-anchor-link" href="#method"><i class="fas fa-link"></i></a>
5051
</h2>
@@ -84,7 +85,7 @@ <h2 class="dyn-anchor-heading">
8485
<br>
8586
<i class="fas fa-bell"></i> En caso de renovar, no es necesario indicar nickname, teléfono y dirección, salvo para actualizar datos.
8687
</p>
87-
88+
</div>
8889
</div>
8990

9091
{% endblock content %}

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,24 @@ body {
2626
.header-page {
2727
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.04);
2828
background-color: $header-bg;
29+
z-index: 99;
2930
}
3031

3132
.content-page {
3233
max-width: 59rem;
3334
min-height: calc(100vh - #{$navbar-height} - #{$footer-height} + 1px);
34-
padding: 2rem 0rem 5rem 0rem;
35+
padding: 2rem 1.2rem 5rem 1.2rem;
3536

3637
@include from($custom-mobile) {
3738
& > .box {
3839
padding: 2rem;
3940
}
4041
}
4142

43+
@include from($desktop){
44+
padding: 2rem 0rem 5rem 0rem;
45+
}
46+
4247
&.is-wide {
4348
max-width: 80rem;
4449
}
@@ -48,9 +53,12 @@ body {
4853
}
4954
}
5055

56+
5157
.footer-page {
5258
background-color: $footer-bg;
5359
position: relative;
60+
margin-top: 2em;
61+
padding: 1.5em 1.5em 2.2em 1.5em;
5462

5563
a {
5664
color: $footer-fg;
@@ -63,22 +71,14 @@ body {
6371
.footer-column {
6472
color: #ebebeb;
6573
padding-top: 2rem;
66-
padding-bottom: 0.5rem;
67-
68-
@include from($desktop) {
69-
padding-top: 2rem;
70-
padding-bottom: 3rem;
71-
}
74+
7275
}
7376

7477
h1,
7578
h2 {
7679
color: whitesmoke;
7780
}
7881

79-
i {
80-
padding-right: 0.2rem;
81-
}
8282
}
8383

8484
/* Error class for Django Forms https://bit.ly/3vidyK2 */
@@ -96,6 +96,7 @@ body {
9696
width: 100%;
9797
z-index: 1;
9898

99+
99100
& .notification {
100101
width: $notification-width;
101102
margin-left: auto;
@@ -104,6 +105,9 @@ body {
104105
margin-bottom: 0;
105106
}
106107
}
108+
.message {
109+
scroll-margin-top: $header-height + 1rem;
110+
}
107111

108112
.container {
109113
padding-top: 2rem;

‎apps/commons/static/commons/css/dyn-anchors.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
}
1414
}
1515
}
16+
.anchor {
17+
scroll-margin-top: $header-height + 1rem;
18+
}

‎apps/commons/static/commons/css/variables.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ $content-heading-weight: 500;
3838
$radius: 0.15rem;
3939
$navbar-height: 4.3rem;
4040

41+
$section-title-margin-bottom: 2.1rem;
42+
4143
$box-radius: $radius;
4244
$box-padding: 1.5rem;
4345
$box-shadow: $default-box-shadow;

‎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>

‎apps/events/static/events/css/event/general.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.section-title {
99
color: $blue-text;
1010
text-align: center;
11-
margin-bottom: 2.1rem;
11+
margin-bottom: $section-title-margin-bottom;
1212
}
1313

1414
.section-detail {

‎apps/events/static/events/css/event/venue.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,8 @@
5252
.venue-youtube {
5353
text-align: center;
5454
}
55+
#event-map{
56+
z-index: 0;
57+
}
5558
}
59+

‎apps/events/templates/events/event.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ <h1 class="title is-1">{{ event.name }}</h1>
6969
</section>
7070

7171

72-
<section id="speakers" class="section speakers">
72+
<section id="speakers" class="section speakers anchor">
7373
<div class="container">
7474
<h1 class="title section-title dyn-anchor-heading">
7575
Ponentes
@@ -106,7 +106,7 @@ <h2 class="speaker-name">{{ speaker.name }} {{ speaker.surname }}</h2>
106106
</section>
107107

108108

109-
<section id="schedule" class="section schedule has-background-white">
109+
<section id="schedule" class="section schedule has-background-white anchor">
110110
<div class="container">
111111
<h1 class="title section-title dyn-anchor-heading">
112112
<p>
@@ -145,7 +145,7 @@ <h1 class="title section-title dyn-anchor-heading">
145145
</section>
146146

147147

148-
<section id="venue" class="section venue">
148+
<section id="venue" class="section venue anchor">
149149
<div class="container">
150150
<h1 class="title section-title dyn-anchor-heading">
151151
Localización
@@ -156,7 +156,7 @@ <h1 class="title section-title dyn-anchor-heading">
156156
{% if event.venue %}
157157
<div class="column is-12-tablet is-6-desktop">
158158
{% if event.venue.is_online %}
159-
<div class="venue-youtube">
159+
<div class="venue-youtube map-section">
160160
<img src="{{ assets|get_asset_key:'events/img/youtube-logo.png' }}">
161161
</div>
162162
{% else %}
@@ -215,7 +215,7 @@ <h1 class="title section-title dyn-anchor-heading">
215215
</section>
216216

217217

218-
<section id="sponsors" class="section sponsors has-background-white">
218+
<section id="sponsors" class="section sponsors has-background-white anchor">
219219
<div class="container">
220220
<h1 class="title section-title dyn-anchor-heading">
221221
Entidades
@@ -248,7 +248,7 @@ <h2 class="category-title subtitle is-5 has-text-centered">{{ category.display_n
248248
</div>
249249
</section>
250250

251-
<section id="past-events" class="section past-events">
251+
<section id="past-events" class="section past-events anchor">
252252
<div class="container">
253253
<h1 class="title section-title dyn-anchor-heading">
254254
Eventos pasados

0 commit comments

Comments
 (0)