Skip to content

Commit 9100520

Browse files
euribateseuribates
committed
Merge branch 'main' of github.com:pythoncanarias/pycan-web into main
2 parents 98eec9c + 0ee1f56 commit 9100520

File tree

11 files changed

+21605
-45
lines changed

11 files changed

+21605
-45
lines changed

‎apps/about/templates/about/base.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
{% load utils %}
44

5-
{% block style %}
5+
{% block styles %}
6+
{{ block.super }}
67
<link rel="stylesheet" href="{{ assets|get_asset_key:'about/custom.min.css' }}">
7-
{% endblock style %}
8+
{% endblock styles %}

‎apps/commons/static/commons/css/bulma.css‎

Lines changed: 21551 additions & 0 deletions
Large diffs are not rendered by default.

‎apps/commons/static/commons/css/bulma.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/commons/static/commons/css/bulma.min.css‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/commons/templates/base.html‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
1-
{% load static %}
2-
{% load utils %}
3-
4-
<!doctype html>
1+
{% load static utils %}<!doctype html>
52
<html lang="es">
63
<head>
74
<meta charset="utf-8">
8-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
9-
<meta name="description" content="">
10-
<meta name="author" content="">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<meta name="description" content="Python Canarias">
7+
<meta name="author" content="Python Canarias">
118

12-
<link rel="icon" href="{{ assets|get_asset_key:'commons/img/favicon.ico' }}">
9+
<link rel="icon" href="{% static 'commons/img/favicon.ico' %}">
1310

1411
<title>{% block title %}{{ organization.name }}{% endblock title %}</title>
1512

1613
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,400i,700" rel="stylesheet">
1714

18-
<link rel="stylesheet" href="{{ assets|get_asset_key:'commons/vendor.min.css' }}">
19-
{% block style %}{% endblock %}
15+
{% block styles %}
16+
<link rel="stylesheet" href="{% static 'commons/css/bulma.min.css' %}">
17+
{% endblock styles %}
18+
2019
</head>
2120
<body class="{% block body_class %}{% endblock %} has-navbar-fixed-top">
22-
21+
.
2322
{% include "header.html" %}
2423

2524
{% block container %}
2625

27-
{% if messages %}
28-
<div class="messages">
29-
{% for message in messages %}
30-
<div class="notification {{ message.tags|msgtag_to_bulmaclass }}">
31-
<button class="delete"></button>
32-
{{ message }}
33-
</div>
34-
{% endfor %}
35-
</div>
36-
{% endif %}
26+
{% if messages %}
27+
<div class="messages">
28+
{% for message in messages %}
29+
<div class="notification {{ message.tags|msgtag_to_bulmaclass }}">
30+
<button class="delete"></button>
31+
{{ message }}
32+
</div>
33+
{% endfor %}
34+
</div>
35+
{% endif %}
3736

38-
<div class="{% block default_content_class %}container content-page{% endblock %} {% block content_class %}{% endblock %}
37+
<div class="{% block default_content_class %}container content-page{% endblock %} {% block content_class %}{% endblock %}
3938
{% if menu %}
4039
is-wide
4140
{% endif %}
@@ -57,7 +56,7 @@
5756

5857
{% include "footer.html" %}
5958

60-
<script src="{{ assets|get_asset_key:'commons/custom.min.js' }}"></script>
59+
<script src="{% static 'commons/custom.min.js' %}"></script>
6160
{% block js %}
6261
{% if current_date.month == 12 and current_date.day >= 21 and current_date.day <= 31 %}
6362
<script src="https://app.embed.im/snow.js" defer></script>

‎apps/events/templates/events/base.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
{% load utils %}
44
{% load leaflet_tags %}
55

6-
{% block style %}
6+
{% block styles %}
7+
{{ block.super }}
78
<link rel="stylesheet" href="{{ assets|get_asset_key:'events/custom.min.css' }}">
89
<style type="text/css" media="screen">
910
.event-item {
@@ -12,7 +13,7 @@
1213
box-shadow: 0px 0px 6px 1px rgba(0,0,0,0.25);
1314
}
1415
</style>
15-
{% endblock style %}
16+
{% endblock styles %}
1617

1718
{% block js %}
1819
{{ block.super }}

‎apps/jobs/templates/jobs/base.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{% extends "base.html" %}
22

3-
{% load utils %}
3+
{% load static %}
44

5-
{% block style %}
6-
<link rel="stylesheet" href="{{ assets|get_asset_key:'jobs/custom.min.css' }}">
7-
{% endblock style %}
5+
{% block styles %}
6+
{{ block.super }}
7+
<link rel="stylesheet" href="{% static 'jobs/css/jobs.css' %}">
8+
{% endblock styles %}
89

910
{% block js %}
10-
{{ block.super }}
11-
<script src="{{ assets|get_asset_key:'jobs/custom.min.js' }}"></script>
11+
{{ block.super }}
12+
<script src="{% static 'jobs/js/jobs.js' %}"></script>
1213
{% endblock js %}

‎apps/learn/templates/learn/base.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{% extends "base.html" %}
22

3-
{% load utils %}
3+
{% load static %}
44

5-
{% block style %}
6-
<link rel="stylesheet" href="{{ assets|get_asset_key:'learn/custom.min.css' }}">
7-
{% endblock style %}
5+
{% block styles %}
6+
{{ block.super }}
7+
<link rel="stylesheet" href="{% static 'learn/css/learn.css' %}">
8+
{% endblock styles %}

‎apps/legal/templates/legal/base.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
{% load utils %}
44

5-
{% block style %}
5+
{% block styles %}
6+
{{ block.super }}
67
<link rel="stylesheet" href="{{ assets|get_asset_key:'legal/custom.min.css' }}">
7-
{% endblock style %}
8+
{% endblock styles %}

‎apps/members/templates/members/base.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{% extends "base.html" %}
2-
{% load utils %}
2+
{% load static %}
33

4-
{% block style %}
5-
<link rel="stylesheet" href="{{ assets|get_asset_key:'members/custom.min.css' }}">
6-
{% endblock style %}
4+
{% block styles %}
5+
{{ block.super }}
6+
<link rel="stylesheet" href="{% static 'members/css/members.css' %}">
7+
{% endblock styles %}
78

89
{% block menu %}
910
{% include 'as_menu.html' %}

0 commit comments

Comments
 (0)