From 610e4b2db8f536e3690945e0cba79765865ee829 Mon Sep 17 00:00:00 2001 From: Jarmil <jarmil.halamicek@seznam.cz> Date: Tue, 20 Oct 2020 06:31:24 +0200 Subject: [PATCH] FIX styleguide pro MS weby --- district/templates/district/base.html | 8 ++------ district/templates/district/district_articles.html | 7 ++++++- district/templates/district/district_contact.html | 9 +++++---- district/templates/district/district_home_page.html | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/district/templates/district/base.html b/district/templates/district/base.html index 45206a19..dbf84248 100644 --- a/district/templates/district/base.html +++ b/district/templates/district/base.html @@ -14,13 +14,9 @@ {% include "shared/favicon_snippet.html" %} <!-- Bootstrap CSS --> - <link rel="stylesheet" href="{% static "shared/vendor/bootstrap-4.4.1/css/bootstrap.min.css" %}"> - <link rel="stylesheet" href="{% static "shared/vendor/fancybox/jquery.fancybox.min.css" %}"> <!-- 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 "shared/vendor/fancybox/jquery.fancybox.min.css" %}" rel="stylesheet"> + <link rel="stylesheet" href="https://styleguide.pir-test.eu/latest//css/styles.css"> <style type="text/css"> .inline-block { @@ -120,7 +116,7 @@ <ui-app inline-template> <ui-view-provider :initial="{regions: false, calendar: false}" v-slot="{ isCurrentView, toggleView }"> - <nav class="subnav py-0"> + <nav class="subnav py-2"> <div class="container container--wide"> <div class="flex"> <button @click="toggleView('regions')" class="btn btn--condensed btn--grey-500 btn--hoveractive btn--to-white text-sm mr-2 px-0" :class="{'btn--activated': isCurrentView('regions')}"> diff --git a/district/templates/district/district_articles.html b/district/templates/district/district_articles.html index fb594009..1d89ee4c 100644 --- a/district/templates/district/district_articles.html +++ b/district/templates/district/district_articles.html @@ -3,7 +3,11 @@ {% block content %} <main> - <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-4 mt-5">{{ page }}</h1> + <div class="container container--default py-8 lg:py-24"> + + <header> + <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1> + </header> <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8"> {% for a in articles %} @@ -44,6 +48,7 @@ </nav> </div> + </div> </main> {% endblock %} diff --git a/district/templates/district/district_contact.html b/district/templates/district/district_contact.html index 0de1045e..7c0c44c0 100644 --- a/district/templates/district/district_contact.html +++ b/district/templates/district/district_contact.html @@ -3,11 +3,12 @@ {% block content %} -<div class="container container--default py-8 lg:py-24"> +<div class="container container--default py-8"> - <div class="d-flex mb-5"> - <div class="col-8 pr-5"> + <div class="lg:flex lg:mt-8 space-y-16 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-5"> + <section class="lg:w-3/5 xl:w-2/3"> + <header> <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1> </header> @@ -23,7 +24,7 @@ {% endfor %} - </div> + </section> <section class="lg:w-2/5 xl:w-1/3 lg:pt-0"> <div class="lg:card lg:elevation-10"> diff --git a/district/templates/district/district_home_page.html b/district/templates/district/district_home_page.html index 03258b25..55386e57 100644 --- a/district/templates/district/district_home_page.html +++ b/district/templates/district/district_home_page.html @@ -4,7 +4,7 @@ {% block content %} <main> - <h1 class="head-alt-md md:head-alt-lg pb-4 lg:pb-8">Aktuálnà témata</h1> + <h1 class="head-alt-md md:head-alt-lg pb-4 lg:pb-8 pt-5">Aktuálnà témata</h1> <!-- list of articles --> <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8"> -- GitLab