jekyll-theme-pirati 8.0.0.pre.alpha4 → 8.0.0

data/_includes/right-bar/bar_map.html

@@ -10,28 +10,29 @@ Note: map is not inside accordion, as map tiles don't load at start due to accor
 {% endcomment %}
 
 {% if (page.mapycz_api) and (page.gps.lat) and (page.gps.long) %}
-{% assign gps_zoom = 16 %}
-{% if (page.gps.zoom) %}
-  {% assign gps_zoom = page.gps.zoom %}
-{% endif %}
-<div class="o-section-block">
-<div id="mapa" style="height: 300px;"></div>
-<script type="text/javascript">
-var center = SMap.Coords.fromWGS84({{ page.gps.long }}, {{ page.gps.lat }});
-{% if page.mapycz_api == 'mini-api' %} // Mapy.cz Mini-API
-var mapa = new SMap(JAK.gel("mapa"), center, {{ gps_zoom }}, SMap.DEF_BASE);
-mapa.addMarker(center);
-{% else %} // default Mapy.cz API
-var mapa = new SMap(JAK.gel("mapa"), center, {{ gps_zoom }});
-mapa.addDefaultLayer(SMap.DEF_BASE).enable();
-var vrstva = new SMap.Layer.Marker();     /* Vrstva se značkami */
-var options = { }
-var znacka = new SMap.Marker(center, 'markerid', options);
-vrstva.addMarker(znacka);
-mapa.addLayer(vrstva);
-vrstva.enable();
-{% endif %}
-</script>
-<a class="dark expanded button large hide-for-print" href="https://mapy.cz/zakladni?x={{page.gps.long}}&y={{page.gps.lat}}&z=16&source=coor&id={{page.gps.long}}%2C{{page.gps.lat}}" target="_blank"> Zobrazit větší mapu </a>
-</div>
+  {% assign gps_zoom = 16 %}
+
+  {% if (page.gps.zoom) %}
+    {% assign gps_zoom = page.gps.zoom %}
+  {% endif %}
+  <div id="mapa" style="height: 300px;"></div>
+  <script type="text/javascript">
+    var center = SMap.Coords.fromWGS84({{ page.gps.long }}, {{ page.gps.lat }});
+    {% if page.mapycz_api == 'mini-api' %} // Mapy.cz Mini-API
+      var mapa = new SMap(JAK.gel("mapa"), center, {{ gps_zoom }}, SMap.DEF_BASE);
+      mapa.addMarker(center);
+      {% else %} // default Mapy.cz API
+      var mapa = new SMap(JAK.gel("mapa"), center, {{ gps_zoom }});
+      mapa.addDefaultLayer(SMap.DEF_BASE).enable();
+      var vrstva = new SMap.Layer.Marker();     /* Vrstva se značkami */
+      var options = { }
+      var znacka = new SMap.Marker(center, 'markerid', options);
+      vrstva.addMarker(znacka);
+      mapa.addLayer(vrstva);
+      vrstva.enable();
+    {% endif %}
+  </script>
+
+  {% capture href %}https://mapy.cz/zakladni?x={{page.gps.long}}&y={{page.gps.lat}}&z=16&source=coor&id={{page.gps.long}}%2C{{page.gps.lat}}{% endcapture %}
+  {% include buttons/image.html href=href target="_blank" icon="ico--map" class="btn btn--black btn--fulwidth btn--hoveractive mt-4" cta="Zobrazit větší mapu" %}
 {% endif %}

data/_includes/right-bar/bar_page_contact.html

@@ -1,12 +1,2 @@
-<aside class="o-section">
-<div class="o-section-inner o-section-inner--rightBlock">
-  <div class="o-section-block">
-    <div class="c-widget-accordion" data-accordion="" data-allow-all-closed="true">
-      <div class="c-widget-accordion-content" data-tab-content="">
-        <h3>Kontakty</h3>
-            {% include right-bar/rbar_profiles.html %}
-      </div>
-    </div>
-  </div>
-</div>
-</aside>
+<h2 class="head-heavy-sm mb-2">Kontakty</h2>
+{% include right-bar/rbar_profiles.html %}

data/_includes/right-bar/bar_people.html

@@ -11,4 +11,4 @@
 </div>
 
 {% capture href %}{% if peopleCol.root %}{{ peopleCol.root }}{% else %}{{ '/lide/' | relative_url }}{% endif %}{% endcapture %}
-{% include buttons/icon.html icon="ico--chevron-right" class="btn--violet-400 btn--fullwidth lg:btn--autowidth pt-4" cta="Poznejte celý náš tým" href=href %}
+{% include buttons/icon.html icon="ico--chevron-right" class="btn--violet-500 btn--fullwidth btn--hoveractive pt-4" cta="Poznejte celý náš tým" href=href %}

data/_includes/right-bar/bar_person_articles.html

@@ -2,5 +2,5 @@
 {% assign posts = site.posts | where_exp: "item","item.authorId contains page.uid" | sort:"date" %}
 
 {% if posts %}
-    {% include right-bar/rbar_articles.html posts=posts title="Seznam článků" %}
+  {% include right-bar/rbar_articles.html posts=posts title="Seznam článků" %}
 {% endif %}

data/_includes/right-bar/bar_profile.html

@@ -12,11 +12,16 @@
 
 {% if page.profiles.wikipedia or page.profiles.facebook or page.profiles.twitter or page.profiles.github or page.profiles.forum or page.profiles.redmine or page.profiles.web or page.profiles.blog %}
   {% include right-bar/rbar_profiles.html %}
+{% endif %}
+
+{% if page.partyUid %}
   <hr />
+  {% include party.html uid=page.partyUid %}
 {% endif %}
 
 <div class="content-block">
   {% if page.mail or page.mob or page.profiles.report %}
+    <hr />
     <div class="space-y-4">
       {% if page.mob %}
         <div>
@@ -39,35 +44,34 @@
         </div>
       {% endif %}
     </div>
-    <hr />
   {% endif %}
 
   {% if page.asistenti %}
+    <hr />
     <h2>Asistenti</h2>
     <div class="space-y-4 mt-4">
       {% for asistent in page.asistenti %}
         {% include people/profile-badge.html class="badge--condensed" item=asistent description=asistent.position %}
       {% endfor %}
     </div>
-    <hr />
   {% endif %}
 
   {% if page.office %}
+    <hr />
     {% assign kancl = page.office | first %}
-    <h2>{{ kancl.name }}</h2>
-    <p>{{ kancl.address }}</p>
-
-    {% if kancl.opening %}
-      <h4>Otevírací doba</h4>
-      <p>{{ kancl.opening}}</p>
-    {% endif %}
+    <h2>Kancelář</h2>
     <iframe
       height="150"
       frameborder="0"
       style="border:0; width:100%"
-      src="https://www.google.com/maps/embed/v1/place?key=AIzaSyCRuL_FU0HdeKCHVNfVJkv2nhNZPr05AJM&q={{ kancl.address | replace: ' ', '+' }}" allowfullscreen>
+      src="{% if kancl.mapIframeLink %}{{ kancl.mapIframeLink }}{% else %}https://www.google.com/maps/embed/v1/place?key=AIzaSyCRuL_FU0HdeKCHVNfVJkv2nhNZPr05AJM&q={{ kancl.address | replace: ' ', '+' }}{% endif %}" allowfullscreen>
     </iframe>
+    <h4>{{ kancl.name }}</h4>
+    <p>{{ kancl.address | | newline_to_br }}</p>
+
+    {% if kancl.opening %}
+      <h4>Otevírací doba</h4>
+      <p>{{ kancl.opening}}</p>
+    {% endif %}
   {% endif %}
-  <!-- Mobile divider -->
-  <hr class="block lg:hidden" />
 </div>

data/_includes/right-bar/bar_program.html

@@ -13,7 +13,7 @@
 
     <ul class="unordered-list unordered-list--linked">
       {% for programSection in programSections %}
-        <li><a {% if page.uid == programSection.uid %}class="font-bold"{% endif %} href="{{ programSection.url | relative_url }}">{{ programSection.title }}</a></li>
+        <li><a class="{% if page.uid == programSection.uid %}font-bold  {% endif %}content-block--nostyle" href="{{ programSection.url | relative_url }}">{{ programSection.title }}</a></li>
       {% endfor %}
     </ul>
     {% unless forloop.last %}

data/_includes/right-bar/bar_textbox.html

@@ -5,16 +5,8 @@ textbox:
   text:  # required
 {% endcomment %}
 {% if page.textbox.text %}
-<div class="o-section-block">
- <ul class="c-widget-accordion c-widget-accordion--dark" data-accordion="" data-allow-all-closed="true">
-   <li class="c-widget-accordion-item is-active" data-accordion-item="">
-     <a href="#" class="c-widget-accordion-link">
-       <span class="c-widget-accordion__title">{% if page.textbox.title %} {{ page.textbox.title }}{% endif %}</span>
-     </a>
-     <div class="c-widget-accordion-content c-content-block" data-tab-content="">
-       {{ page.textbox.text }}
-     </div>
-   </li>
- </ul>
-</div>
+  {% if page.textbox.title %}<h2 class="head-heavy-sm mb-2">{{ page.textbox.title }}</h2>{% endif %}
+  <div class="content-block">
+    <p>{{ page.textbox.text }}</p>
+  </div>
 {% endif %}

data/_includes/right-bar/bar_tw.html

@@ -1,12 +1,2 @@
-<div class="o-section-block">
- <ul class="c-widget-accordion" data-accordion="" data-allow-all-closed="true">
-   <li class="c-widget-accordion-item is-active" data-accordion-item="">
-     <a href="#" class="c-widget-accordion-link">
-       <span class="c-widget-accordion__title">Twitter</span>
-     </a>
-     <div class="c-widget-accordion-content" data-tab-content="">
-       <a class="twitter-timeline" href="https://twitter.com/{{site.tw}}" data-height="520">Tweets by @{{site.tw}}</a>
-     </div>
-   </li>
- </ul>
-</div>
+<h2 class="head-heavy-sm mb-2">Twitter</h2>
+<a class="twitter-timeline" href="https://twitter.com/{{site.tw}}" data-height="520">Tweets by @{{site.tw}}</a>

data/_includes/right-bar/bar_video.html

@@ -1,42 +1,16 @@
 {% if page.youtube %}
-<div class="o-section-block show-for-medium">
-  <ul class="c-widget-accordion" data-accordion="" data-allow-all-closed="true">
-    <li class="c-widget-accordion-item is-active" data-accordion-item="">
+  {% if page.youtube.title %}
+    <h2 class="head-heavy-sm mb-2">{{page.youtube.title}}</h2>
+  {% endif %}
 
-      {% if page.youtube.title %}
-      <a href="#" class="c-widget-accordion-link c-widget-accordion-link--yt">
-	      <span class="c-widget-accordion__title">{{page.youtube.title}}</span>
-      </a>
-      {% endif %}
+  {% if page.youtube.id %}
+    <iframe width="100%" src="https://www.youtube-nocookie.com/embed/{{page.youtube.id}}?rel=0&amp;controls=0" style="border: 0;" allowfullscreen=""></iframe>
+  {% endif %}
+  {% if page.youtube.playlist %}
+    <iframe width="100%" src="https://www.youtube.com/embed/videoseries?list={{page.youtube.playlist}}" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+  {% endif %}
 
-      <div class="c-widget-accordion-content" data-tab-content="">
-        <div class="c-widget-accordion-content-video">
-          
-          <div class="c-widget-accordion-content__video u-video-wrapper-16-9">
-          
-             {% if page.youtube.id %}
-		  <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/{{page.youtube.id}}?rel=0&amp;controls=0" style="border: 0;" allowfullscreen=""></iframe>
-             {% endif %}
-             
-	     {% if page.youtube.playlist %}
-
-	     <iframe width="560" height="315" src="https://www.youtube.com/embed/videoseries?list={{page.youtube.playlist}}" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
-             {% endif %}
-          
-          </div>
-
-          {% if page.youtube.button %}
-          <div class="c-widget-accordion-content__cta">
-		  <a class="expanded button large u-0margin" href={{page.youtube.button.url}} target="_blank" rel="noopener noreferrer">
-			  {{page.youtube.button.title}}
-		  </a>
-          </div>
-          {% endif %}
-
-        </div>
-      </div>
-     
-    </li>
-  </ul>
-</div>
+  {% if page.youtube.button %}
+    {% include buttons/icon.html href=page.youtube.button.url target="_blank" cta=page.youtube.button.title class="mt-4 btn--fullwidth btn--hoveractive" icon="ico--chevron-right" %}
+  {% endif %}
 {% endif %}

data/_includes/right-bar/rbar.html

@@ -1,5 +1,5 @@
 <aside class="container-padding--zero lg:container-padding--auto lg:card lg:elevation-10">
-  <div class="lg:card__body {{ include.cardBodyClass }}">
+  <div class="lg:card__body p-4 lg:p-8">
     {% for rbar in page.rbar %}
       {% if rbar contains 'profile' %}
         {% include right-bar/bar_profile.html %}
@@ -13,9 +13,6 @@
       {% if rbar contains 'program' %}
         {% include right-bar/bar_program.html %}
       {% endif %}
-      {% if rbar contains 'cal' and site.calendar %}
-        {% include right-bar/bar_cal.html %}
-      {% endif %}
       {% if rbar contains 'people' %}
         {% include right-bar/bar_people.html %}
       {% endif %}
@@ -47,6 +44,10 @@
         {% include right-bar/bar_page_contact.html %}
       {% endif %}
 
+      {% unless forloop.last %}
+        <hr />
+      {% endunless %}
+
       {% comment %}Allows to append custom right bars variants{% endcomment %}
       {% include right-bar/custom-bars.html rbar=rbar %}
     {% endfor %}

data/_layouts/blank-article.html

@@ -4,7 +4,7 @@ layout: default
 
 <div class="container container--default py-8 lg:py-24">
 	{% if page.article-boxes %}
-		{% include article-box/three-in-row.html article-boxes=page.article-boxes %}
+		{% include article-box/list.html article-boxes=page.article-boxes class="mb-8 lg:mb-16" %}
 	{% endif %}
 
   <main>

data/_layouts/communal-elections.html

@@ -141,14 +141,9 @@ layout: default
                     {% include avatar.html class="avatar--sm candidate-table-row__avatar" src=img alt=candidate.name %}
                     <div class="candidate-table-row__name head-heavy-2xs font-bold">{% if candidatePage %}{{ candidatePage.name }}{% else %}{{ candidate.name }}{% endif %}</div>
                     <div class="candidate-table-row__bio head-allcaps-3xs">{% if candidate.age %}{{ candidate.age }} let{% endif %}{% if candidate.age and candidate.profession %}, {{ candidate.profession }}{% endif %}</div>
-                    {% if candidate.party %}
+                    {% if candidate.partyUid %}
                       <div class="candidate-table-row__affiliation">
-                        {% if candidate.partyImg %}
-                          {% comment %}We expect an SVG format here to make things scalable{% endcomment %}
-                          {% capture partyImg %}{{ candidate.partyImg | prepend: "/assets/img/" | absolute_url }}{% endcapture %}
-                          {% include avatar.html class="w-6 mr-2" alt=candidate.party src=partyImg %}
-                        {% endif %}
-                        <span class="font-bold font-condensed">{{ candidate.party }}</span>
+                        {% include party.html uid=candidate.partyUid %}
                       </div>
                     {% endif %}
                   </{% if candidatePage %}a{% else %}div{% endif %}>

data/_layouts/person.html

@@ -20,7 +20,16 @@ layout: default
 
 {% capture personName %}{% include people/fullname.html person=page %}{% endcapture %}
 
-{% include hero/simple.html headline=personName description=page.description descriptionClass="max-w-xl" heroSpacing="pt-24 pb-24 lg:pt-32 pb-24" class="candidate-detail__hero" bgImg=imgPath %}
+{%
+  include hero/simple.html
+  headline=personName
+  description=page.profession
+  headlineClass="text-center lg:text-left mx-auto"
+  descriptionClass="max-w-xl mx-auto text-center lg:text-left"
+  heroSpacing="pt-16 pb-24 lg:pt-32 pb-24"
+  class="candidate-detail__hero"
+  bgImg=imgPath
+%}
 
 <div class="container container--default py-8 lg:pb-24">
   <main>
@@ -31,7 +40,7 @@ layout: default
         </div>
       </section>
       <section class="lg:w-2/5 xl:w-1/3 pt-8 lg:pt-0 order-first lg:order-last candidate-detail__sidebar">
-        {% include right-bar/rbar.html cardBodyClass="p-4 lg:p-8" %}
+        {% include right-bar/rbar.html %}
         <!-- Mobile divider -->
         <hr class="block lg:hidden" />
       </section>

data/_layouts/pirate-center.html

@@ -31,32 +31,36 @@ layout: default
     {% endif %}
 
     <div class="lg:flex lg:space-x-8 xl:space-x-16">
-      <div class="lg:w-3/5 xl:w-2/3 content-block">
-        {{ content }}
+      <div class="lg:w-3/5 xl:w-2/3">
+        <div class="content-block">
+          {{ content }}
+        </div>
         {% if page.calendarId or page.calendarPage %}
-          <h2>{{ page.calendarTitle | default: "Kalendář akcí" }}</h2>
-          {% include calendar.html calendarId=page.calendarId title=page.calendarTitle calendarPage=page.calendarPage hideBanner=true %}
+          <h2 class="head-heavy-sm mb-4 mt-4">{{ page.calendarTitle | default: "Kalendář akcí" }}</h2>
+          {% include calendar.html calendarId=page.calendarId title=page.calendarTitle calendarPage=page.calendarPage hideBanner=true classes="mb-4" %}
         {% endif %}
       </div>
       <div class="pt-8 lg:w-2/5 xl:w-1/3 lg:pt-0">
         <div class="lg:card lg:elevation-10">
-          <div class="lg:card__body content-block" itemprop="address" itemtype="https://schema.org/PostalAddress" itemscope>
+          <div class="lg:card__body" itemprop="address" itemtype="https://schema.org/PostalAddress" itemscope>
+            <div class="content-block">
             <h2>Kde to najdu?</h2>
-            {% if page.mapIframeLink %}
-              <iframe src="{{ page.mapIframeLink }}" width="100%" height="300" id="mapa-mobile" frameborder="0" style="border:0;" allowfullscreen="" aria-hidden="false" tabindex="0"></iframe>
-            {% endif %}
-            {% if page.address %}
-              <p>
-                {{ page.address | newline_to_br }}
-              </p>
-            {% endif %}
-            {% if page.addressNote %}
-              <p><small>{{ page.addressNote }}</small></p>
-            {% endif %}
-            <hr>
-            {% if page.contactPersons %}
-              <h2>Kontakt</h2>
+              {% if page.mapIframeLink %}
+                <iframe src="{{ page.mapIframeLink }}" width="100%" height="300" id="mapa-mobile" frameborder="0" style="border:0;" allowfullscreen="" aria-hidden="false" tabindex="0"></iframe>
+              {% endif %}
+              {% if page.address %}
+                <p>
+                  {{ page.address | newline_to_br }}
+                </p>
+              {% endif %}
+              {% if page.addressNote %}
+                <p><small>{{ page.addressNote }}</small></p>
+              {% endif %}
+              <hr>
+            </div>
 
+            {% if page.contactPersons %}
+              <h2 class="head-heavy-sm mb-2">Kontakt</h2>
               {% for contact in page.contactPersons %}
                 {% assign person = site.people | where_exp:"item","item.uid contains contact.id" | first %}
                 {% if forloop.first %}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-pirati
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre.alpha4
+  version: 8.0.0
 platform: ruby
 authors:
 - Jitka Novotná
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -64,10 +64,11 @@ files:
 - README.md
 - _data/campaigns.yml
 - _data/menu.yml
+- _data/parties.yml
 - _includes/404.html
 - _includes/accordeon/accordeon.html
 - _includes/article-box/article-box.html
-- _includes/article-box/three-in-row.html
+- _includes/article-box/list.html
 - _includes/article-infobox.html
 - _includes/articles/author.html
 - _includes/articles/horizontal-article.html
@@ -108,6 +109,7 @@ files:
 - _includes/icon-twitter.svg
 - _includes/js/main.html
 - _includes/page-header.html
+- _includes/party.html
 - _includes/people/fullname.html
 - _includes/people/list-group.html
 - _includes/people/list-responsive.html
@@ -118,7 +120,6 @@ files:
 - _includes/regions/crossroad2.html
 - _includes/regions/item.html
 - _includes/right-bar/bar_board.html
-- _includes/right-bar/bar_cal.html
 - _includes/right-bar/bar_fb.html
 - _includes/right-bar/bar_garant.html
 - _includes/right-bar/bar_kodo.html
@@ -159,71 +160,6 @@ files:
 - _layouts/regions.html
 - _layouts/regions2.html
 - _layouts/taglist.html
-- _sass/_base.scss
-- _sass/_fonts.scss
-- _sass/_settings.scss
-- _sass/_sprites.scss
-- _sass/components/Slider.scss
-- _sass/components/academic-title.scss
-- _sass/components/article-card.scss
-- _sass/components/article-infobox.scss
-- _sass/components/article-listing.scss
-- _sass/components/banner.scss
-- _sass/components/blockquote.scss
-- _sass/components/card.scss
-- _sass/components/contact-bar.scss
-- _sass/components/content-block.scss
-- _sass/components/content-card.scss
-- _sass/components/corner-ribbon.scss
-- _sass/components/cta-button.scss
-- _sass/components/footer.scss
-- _sass/components/header-bar.scss
-- _sass/components/headline-media.scss
-- _sass/components/hero.scss
-- _sass/components/highlight.scss
-- _sass/components/hp-banner.scss
-- _sass/components/icon.scss
-- _sass/components/intention-map.scss
-- _sass/components/member-list.scss
-- _sass/components/metadata-block.scss
-- _sass/components/multicolumn.scss
-- _sass/components/pagination.scss
-- _sass/components/person.scss
-- _sass/components/profile-badge.scss
-- _sass/components/program.scss
-- _sass/components/region.scss
-- _sass/components/simple-accordion.scss
-- _sass/components/suggest-improvement.scss
-- _sass/components/tag.scss
-- _sass/components/tile.scss
-- _sass/components/top-bar.scss
-- _sass/components/top-sub-nav.scss
-- _sass/components/typography.scss
-- _sass/components/vertical-navigation.scss
-- _sass/components/widget-accordion.scss
-- _sass/components/widget-share-box.scss
-- _sass/components/widget-simple-text.scss
-- _sass/layouts/_cast.scss
-- _sass/layouts/_kandidatka.scss
-- _sass/objects/media.scss
-- _sass/objects/section.scss
-- _sass/objects/space.scss
-- _sass/pirati.scss
-- _sass/utilities/header-styles.scss
-- _sass/utilities/utilities.scss
-- assets/css/main.scss
-- assets/fonts/BebasNeue-Thin.ttf
-- assets/fonts/BebasNeue-Thin.woff
-- assets/fonts/BebasNeueBold.ttf
-- assets/fonts/BebasNeueBold.woff
-- assets/fonts/BebasNeueBook.ttf
-- assets/fonts/BebasNeueBook.woff
-- assets/fonts/BebasNeueLight.ttf
-- assets/fonts/BebasNeueLight.woff
-- assets/fonts/BebasNeueRegular.ttf
-- assets/fonts/BebasNeueRegular.woff
-- assets/fonts/demo.html
-- assets/fonts/stylesheet.css
 - assets/icons/blog.png
 - assets/icons/compass.png
 - assets/icons/facebook.png
@@ -376,9 +312,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6