Skip to content
Snippets Groups Projects
Commit 1a6cff6c authored by jarmil's avatar jarmil
Browse files

Merge branch 'test' into localwebs

parents e1f72545 cb77be8b
Branches
No related tags found
2 merge requests!173Release,!134Weby pro MS
Showing
with 8 additions and 8 deletions
......@@ -14,8 +14,8 @@
{% include "shared/favicon_snippet.html" %}
<!-- Styles -->
<link href="{% static "uniweb/assets/css/styles.css" %}" rel="stylesheet" media="all" />
<link href="{% static "uniweb/assets/css/pattern-scaffolding.css" %}" rel="stylesheet" media="all" />
<link href="{% static "styleguide18/assets/css/styles.css" %}" rel="stylesheet" media="all" />
<link href="{% static "styleguide18/assets/css/pattern-scaffolding.css" %}" rel="stylesheet" media="all" />
<link href="{% static "shared/vendor/fancybox/jquery.fancybox.min.css" %}" rel="stylesheet">
<style type="text/css">
......@@ -24,8 +24,8 @@
}
</style>
{% if page.matomo_id %}
{% include "shared/matomo_snippet.html" with matomo_id=page.matomo_id %}
{% if page.root_page.matomo_id %}
{% include "shared/matomo_snippet.html" with matomo_id=page.root_page.matomo_id %}
{% endif %}
</head>
......@@ -38,7 +38,7 @@
<div class="container container--wide navbar__content max-w-screen-xl" :class="{'navbar__content--initialized': true}">
<div class="navbar__brand my-4 flex items-center lg:pr-8 lg:my-0">
<a href="/">
<img src="{% static "uniweb/assets/images/logo-round-white.svg" %}" class="w-8" />
<img src="{% static "styleguide18/assets/images/logo-round-white.svg" %}" class="w-8" />
</a>
<a href="/" class="pl-4 font-bold text-xl lg:border-r lg:border-grey-300 lg:pr-8">{{ page.root_page.seo_title }}</a>
</div>
......@@ -74,7 +74,7 @@
<div class="footer__main py-4 lg:py-16 container container--default">
<section class="footer__brand">
<a href="https://www.pirati.cz">
<img src="{% static "uniweb/assets/images/logo.svg" %}" alt="logo pirátské strany" class="w-32 md:w-40 pb-6" />
<img src="{% static "styleguide18/assets/images/logo.svg" %}" alt="logo pirátské strany" class="w-32 md:w-40 pb-6" />
</a>
<p class="para hidden md:block md:mb-4 lg:mb-0 text-grey-200">
<span class="copyleft inline-block">&copy;</span> {% now "Y" %} Piráti. Všechna práva vyhlazena. Sdílejte a nechte ostatní sdílet za stejných podmínek.
......@@ -115,8 +115,8 @@
</ui-app>
</footer>
<script src="{% static "uniweb/assets/js/vue.2.6.11.js" %}"></script>
<script src="{% static "uniweb/assets/js/main.bundle.js" %}"></script>
<script src="{% static "styleguide18/assets/js/vue.2.6.11.js" %}"></script>
<script src="{% static "styleguide18/assets/js/main.bundle.js" %}"></script>
<script src="{% static "shared/vendor/jquery/jquery-3.4.1.min.js" %}"></script>
<script src="{% static "shared/vendor/lazysizes/lazysizes.min.js" %}"></script>
<script src="{% static "shared/vendor/fancybox/jquery.fancybox.min.js" %}"></script>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment