diff --git a/diskuze/templates/diskuze/diskuze_index_page.html b/diskuze/templates/diskuze/diskuze_index_page.html index 738a4ac..22f7f0b 100644 --- a/diskuze/templates/diskuze/diskuze_index_page.html +++ b/diskuze/templates/diskuze/diskuze_index_page.html @@ -2,31 +2,6 @@ {% load wagtailcore_tags wagtailimages_tags static %} {% block body_class %}template-homepage{% endblock %} {% block content %} -

{{ page.title }}

{{ page.intro }}
diff --git a/diskuze/templates/diskuze/diskuze_page.html b/diskuze/templates/diskuze/diskuze_page.html index a3cae53..e76962a 100644 --- a/diskuze/templates/diskuze/diskuze_page.html +++ b/diskuze/templates/diskuze/diskuze_page.html @@ -9,21 +9,17 @@ diff --git a/home/static/css/welcome_page.css b/home/static/css/welcome_page.css index 071bab4..e69de29 100644 --- a/home/static/css/welcome_page.css +++ b/home/static/css/welcome_page.css @@ -1,4 +0,0 @@ -.logo{ - width: 10px; - height: 30px; -} \ No newline at end of file diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index c59e8e4..e485d1f 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -1,29 +1,5 @@ {% extends "base.html" %} -{% load static %} -{% block content %} - +{% load wagtailcore_tags wagtailimages_tags static %} +{% block body_class %}template-homepage{% endblock %} +{% block content %} {% endblock content %} diff --git a/home/templates/home/welcome_page.html b/home/templates/home/welcome_page.html deleted file mode 100644 index 6368471..0000000 --- a/home/templates/home/welcome_page.html +++ /dev/null @@ -1,52 +0,0 @@ -{% load i18n wagtailcore_tags %} - -
- -
- {% comment %} - This works for all cases but prerelease versions: - {% endcomment %} - - {% trans "View the release notes" %} - -
-
-
-
- -
-
-

{% trans "Welcome to your new Wagtail site!" %}

-

{% trans 'Please feel free to join our community on Slack, or get started with one of the links below.' %}

-
-
- diff --git a/news/templates/news/news_index_page.html b/news/templates/news/news_index_page.html index a3f1659..c7785ff 100644 --- a/news/templates/news/news_index_page.html +++ b/news/templates/news/news_index_page.html @@ -3,31 +3,6 @@ {% block body_class %}template-homepage{% endblock %} {% block content %} {% comment %} Delete the line below if you're just getting started and want to remove the welcome screen! {% endcomment %} -

{{ page.title }}

{{ page.intro|richtext }}
@@ -35,9 +10,9 @@ {% for post in page.get_children %} {% with post=post.specific %}
-
+
- {% image post.image class="img-fluid" fill-400x200 %} + {% image post.image class="obrazek img-fluid" fill-400x200 %}
diff --git a/veterina/static/css/veterina.css b/veterina/static/css/veterina.css index 1c03aeb..253322e 100644 --- a/veterina/static/css/veterina.css +++ b/veterina/static/css/veterina.css @@ -1,8 +1,42 @@ +body{ + background: #8E0E00; /* fallback for old browsers */ + background: -webkit-linear-gradient(to right, #1F1C18, #8E0E00); /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to right, #1F1C18, #8E0E00); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ +} + .logo{ width: 50px; height: 50px; } -.card{ - border-top: 10px solid black; + +h2{ + color: white; +} + +.karta{ + padding: 20px; + background: linear-gradient(to right, #EAEAEA, #EAEAEA, #EAEAEA, #EAEAEA); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + color: white; +} + +.obrazek{ + border-radius: 30%; +} + +a:hover{ + color:white; + cursor: p; +} + +a:link{ + text-decoration: none; +} + +.card-title a{ + color:white; +} + +nav{ + background: linear-gradient(to right, #EAEAEA, #EAEAEA, #EAEAEA, #EAEAEA); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ } \ No newline at end of file diff --git a/veterina/templates/base.html b/veterina/templates/base.html index 3e87171..2f37d2f 100644 --- a/veterina/templates/base.html +++ b/veterina/templates/base.html @@ -28,8 +28,29 @@ {% endblock %} - + {% wagtailuserbar %} + {% block content %}{% endblock %} {# Global javascript #}