adhesiones-jekyll-theme 0.4.2 → 0.4.13

data/_data/schema.yml

@@ -0,0 +1,13 @@
+---
+organization:
+  home:
+  - "adhesion"
+  - "adhesion_individual"
+  post: []
+  about:
+    - "menu_internal"
+    - "menu_external"
+  theme:
+    - "privacy_policy"
+    - "code_of_conduct"
+    - "license"

data/_data/sutty.yml

@@ -0,0 +1,6 @@
+---
+colaboracion_anonima: true
+contact: false
+acepta_invitades: false
+slugify_mode: "default"
+pagination: true

data/_includes/footer.html

@@ -18,7 +18,7 @@
 
   {% if privacy_policy %}
     <li>
-      <a href="{{ privacy_policy.url }}" rel="privacy-policy">{{ privacy_policy.title }}</a>
+      <a href="{{ privacy_policy.url }}" rel="privacy-policy" id="privacy-policy">{{ privacy_policy.title }}</a>
     </li>
   {% endif %}
 

data/_includes/navbar.html

@@ -1,35 +1,19 @@
-<nav class="navbar navbar-expand-lg navbar-light bg-light d-print-block" role="navigation" aria-label="{{ site.i18n.menu.title }}">
-  <a class="navbar-brand" href="">
-    {% include_cached logo.svg %}
-  </a>
+{% assign about = site.posts | find: 'layout', 'about' %}
+{% assign menu = site.posts | where: 'layout', 'menu_internal' %}
+{% assign menu = site.posts | where: 'layout', 'menu_external' | concat: menu | order %}
 
-  <ul class="navbar-nav d-print-none" data-controller="menu">
-    {%- for item in site.i18n.menu.items -%}
-      {% comment %}
-      Algunos items del menú tienen layouts para indicar que
-      queremos el primero de esos artículos independientemente de
-      la URL.
+<nav class="navbar navbar-expand-lg navbar-light d-print-block" role="navigation" aria-label="{{ site.i18n.menu.title }}">
+  {% if about.logo.path %}
+    <a class="navbar-brand" href="?#">
+      <img src="{{ about.logo.path | thumbnail: nil, 80 | component_escape }}" alt="{{ about.logo.description | escape_once }}" />
+    </a>
+  {% endif %}
 
-      XXX: Como las asignaciones sobreviven a este archivo hay que
-      convertirlas a nil cuando se las deja de usar.
-      {% endcomment %}
-      {%- if item.layout -%}
-        {%- assign post = site.posts | find: 'layout', item.layout -%}
-      {%- else -%}
-        {%- assign post = nil -%}
-      {%- endif -%}
-
-      {%- assign href = post.url | default: item.href -%}
-      {%- assign active = include.active_cache_key | equals: href -%}
+  <ul class="navbar-nav d-print-none">
+    {%- for item in menu -%}
       <li class="nav-item">
-        <a data-target="menu.item" class="nav-link {{ active | ternary: 'active', '' }}" href="{{ href }}">
+        <a data-target="menu.item" class="nav-link" href="{{ item.link | component_escape }}">
           {{ item.title }}
-
-          {%- if active -%}
-            <span class="sr-only">
-              {{ site.i18n.menu.active | default: '(current)' }}
-            </span>
-          {%- endif -%}
         </a>
       </li>
     {%- endfor -%}

data/_includes/new_content.html

@@ -0,0 +1 @@
+{% include text.html field=field %}

data/_includes/script.html

@@ -0,0 +1,5 @@
+{% comment %}
+  @param :src [String]
+{% endcomment %}
+
+<script defer src="{{ include.src | uri_escape }}" data-turbo-track="reload"></script>

data/_includes/share_box.html

@@ -1,6 +1,6 @@
 <input type="checkbox" id="share" class="toggler" autocomplete="off" />
 
-<label class="share btn border btn-block" for="share">
+<label class="share btn border btn-block" for="share" data-action="share#share">
   {{ site.i18n.share.text }}
   <i class="fa fa-{{ site.i18n.share.icon }}"></i>
 

data/_layouts/default.html

@@ -11,14 +11,16 @@
 
     <link href="assets/css/styles.css?{{ site.time | date: '%s' }}" rel="stylesheet" data-turbo-track="reload">
 
-    {% comment %}
-    Webpack.  La configuración se pasa por variables de entorno, en
-    desarrollo hay que evitar el archivo .env (copiarlo de .env.example
-    si no existe.
-    {% endcomment %}
-    <link rel="preload" as="script" type="text/javascript" href="env.js" />
-    <script type="text/javascript" src="env.js"></script>
-    <script defer type="text/javascript" src="assets/js/pack.js"></script>
+    {%- include script.html src="assets/js/env.js" -%}
+    {%- if jekyll.environment == 'production' -%}
+      {%- for pack in site.data.manifest.outputs -%}
+        {%- unless pack[1].entryPoint -%}{%- continue -%}{%- endunless -%}
+        {%- assign src = pack[0] -%}
+        {%- include script.html src=src -%}
+      {%- endfor -%}
+    {%- else -%}
+      {%- include script.html src="pack.js" -%}
+    {%- endif -%}
 
     {% comment %}
     Agregar otras tipografías.  Esto hace que las tipografías se carguen
@@ -47,6 +49,8 @@
     {%- endif -%}
   </head>
   <body>
+    {% include_cached navbar.html %}
+
     <main class="container">
       <div class="row justify-content-center d-print-block">
         <div class="col">

data/_layouts/home.html

@@ -1,22 +1,26 @@
 ---
 layout: default
 ---
-
-{% assign documento = site.posts | where: 'layout', 'post' | first %}
+{%- assign adhesiones = site.posts | where: 'layout', 'adhesion' -%}
+{%- assign adhesiones_individuales = site.posts | where: 'layout', 'adhesion_individual' -%}
+{%- assign total = adhesiones_individuales | size %}
+{%- assign total = adhesiones | size | plus: total -%}
+{%- assign adhesiones_individuales = adhesiones_individuales | where: 'public', true | where: 'draft', false -%}
 
 <section id="documento">
   <article>
     <header>
       <div class="row no-gutters align-items-center justify-content-between mb-3 mt-5">
         <div class="col-6 col-lg-9">
-          <h2 class="m-0 pr-3">{{ documento.author }}</h2>
+          <h2 class="m-0 pr-3">{{ page.author }}</h2>
         </div>
 
         <div class="col-6 col-lg-3 d-print-none d-flex flex-column align-items-end justify-content-center">
           <a
-            href="{{ site.i18n.home.campaign.url }}"
+            href="{{ site.i18n.home.campaign.url | component_escape }}"
             class="btn btn-primary btn-sm-sm btn-xs-sm btn-block"
-            target="_blank">
+            target="_blank"
+            rel="noopener">
             {{ site.i18n.home.campaign.text }}
           </a>
         </div>
@@ -24,40 +28,47 @@ layout: default
 
       <div class="row no-gutters align-items-center justify-content-between mb-3">
         <div class="col-9 pr-3">
-          <h1 class="font-weight-bold">{{ documento.title }}</h1>
+          <h1 class="font-weight-bold">{{ page.title }}</h1>
           &mdash;
-          <time datetime="{{ documento.date }}">
-            {{ documento.date | date: site.i18n.date.format }}
+          <time datetime="{{ page.date }}">
+            {{ page.date | date: site.i18n.date.format }}
           </time>
         </div>
 
-        <div class="col-12 col-lg-3 d-print-none d-flex flex-column align-items-end justify-content-center">
-          <button class="print btn border-left btn-block mb-3">
+        <div
+          data-controller="print share"
+          data-share-title-value="{{ page.title | escape_once }}"
+          data-share-text-value="{{ page.description | escape_once }}"
+          data-share-url-value="{{ page.url | absolute | component_escape }}"
+          class="col-12 col-lg-3 d-print-none d-flex flex-column align-items-end justify-content-center">
+          <button data-action="print#print" class="btn border-left btn-block mb-3">
             {{ site.i18n.home.print.text }}
             <i class="fa fa-{{ site.i18n.home.print.icon }}"></i>
           </button>
 
-          {% include share_box.html url=page.url title=documento.title description=documento.description %}
+          {% include share_box.html url=page.url title=page.title description=page.description %}
         </div>
       </div>
     </header>
 
-    {%- if documento.image.path -%}
+    {%- if page.image.path -%}
       <div class="float-lg-right">
         <img
           class="img-fluid ml-lg-3 mb-lg-3"
-          src="{{ documento.image.path | thumbnail: 500 }}"
-          alt="{{ documento.image.description | default: documento.title }}" />
+          src="{{ page.image.path | thumbnail: 500 | component_escape }}"
+          alt="{{ page.image.description | default: page.title | escape_once }}" />
       </div>
     {%- endif -%}
 
-    {{ documento.content }}
+    <div class="content">
+      {{ page.content }}
+    </div>
   </article>
 </section>
 
 <section id="sumarse" class="d-print-none">
   <h1 class="color-up">{{ site.i18n.home.form.title }}</h1>
-  <img class="d-none" src="{{ site.sutty }}v1/sites/{{ site.hostname }}/invitades/cookie.png" />
+  <img class="d-none" src="api/v1/sites/{{ site.name }}/invitades/cookie.png" />
 
   <div class="row no-gutters align-items-center">
     <div class="col-12 col-lg-6 pt-5">
@@ -78,8 +89,8 @@ layout: default
         <div class="toggled collapsed fade">
           <form
             data-controller="contact"
-            data-delay="30"
-            action="{{ site.sutty }}v1/sites/{{ site.hostname }}/posts/{{ form }}" method="post" enctype="multipart/form-data">
+            data-contact-delay-value="30"
+            action="api/v1/sites/{{ site.name }}/posts/{{ form }}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="lang" value="{{ site.locale }}" />
             <div class="row justify-content-center">
               {%- for field in site.data.layouts[form] -%}
@@ -93,11 +104,9 @@ layout: default
 
               <div class="col-12">
                 <input
-                  data-target="contact.submit"
+                  data-contact-target="submit"
                   type="submit" value="{{ site.i18n.home.form.submit }}" class="btn btn-success btn-block" />
-                <small
-                  data-target="contact.help"
-                  class="form-text text-muted">
+                <small class="form-text text-muted">
                   {{ site.i18n.home.form.submit_help }}
                 </small>
               </div>
@@ -108,7 +117,7 @@ layout: default
     </div>
 
     <div class="col-12 col-lg-6 mt-5 mt-lg-0 pl-lg-5">
-        {%- if documento.cita -%}
+        {%- if page.cita -%}
         <blockquote class="blockquote">
 
           <div class="font-bigger d-flex flex-row align-items-center justify-content-space-between">
@@ -117,7 +126,7 @@ layout: default
             </div>
 
             <div>
-              {{ documento.cita | append: '' | markdownify }}
+              {{ page.cita | append: '' | markdownify }}
             </div>
 
             <div class="ml-2 align-self-end">
@@ -125,9 +134,9 @@ layout: default
             </div>
           </div>
 
-          {%- if documento.cita_autore -%}
+          {%- if page.cita_autore -%}
             <footer class="blockquote-footer text-right">
-              {{ documento.cita_autore }}
+              {{ page.cita_autore }}
             </footer>
           {%- endif -%}
         </blockquote>
@@ -136,12 +145,6 @@ layout: default
   </div>
 </section>
 
-{%- assign adhesiones = site.posts | where: 'layout', 'adhesion' -%}
-{%- assign adhesiones_individuales = site.posts | where: 'layout', 'adhesion_individual' -%}
-{%- assign total = adhesiones_individuales | size %}
-{%- assign total = adhesiones | size | plus: total -%}
-{%- assign adhesiones_individuales = adhesiones_individuales | where: 'public', true | where: 'draft', false -%}
-
 <section class="mt-5" id="adhesiones">
   <header class="row align-items-center justify-content-between">
     <div class="col-12 col-lg-4">
@@ -156,8 +159,12 @@ layout: default
       </p>
     </div>
 
-    <div class="col-6 col-lg-4">
-      <label for="share" class="share btn border d-print-none">
+    <div class="col-6 col-lg-4"
+          data-controller="share"
+          data-share-title-value="{{ page.title | escape_once }}"
+          data-share-text-value="{{ page.description | escape_once }}"
+          data-share-url-value="{{ page.url | absolute | component_escape }}">
+      <label for="share" class="share btn border d-print-none" data-action="share#share">
         {{ site.i18n.home.share_post.text }}
         <i class="fa fa-{{ site.i18n.home.share_post.icon }}"></i>
       </label>
@@ -185,7 +192,9 @@ layout: default
         </time>
       </header>
 
-      {{ adhesion.content }}
+      <div class="content">
+        {{ adhesion.content }}
+      </div>
     </article>
   {%- endfor -%}
 
@@ -204,11 +213,17 @@ layout: default
         </time>
       </header>
 
-      {{ adhesion.content }}
+      <div class="content">
+        {{ adhesion.content }}
+      </div>
     </article>
   {%- endfor -%}
 
   <footer class="row no-gutters justify-space-between">
+    <div class="col-12">
+      <h1>{{ site.i18n.home.organizaciones }}</h1>
+    </div>
+
     {%- for adhesion in adhesiones -%}
       {%- unless adhesion.logo.path -%}
         {%- continue -%}
@@ -216,15 +231,19 @@ layout: default
 
       <div class="col mb-5">
         {%- if adhesion.web -%}
-          <a href="{{ adhesion.web }}" target="_blank">
+          <a href="{{ adhesion.web | component_escape }}" target="_blank" rel="noopener">
             <img
-              src="{{ adhesion.logo.path | thumbnail: 200 }}"
-              alt="{{ adhesion.title }}" />
+              loading="lazy"
+              width="200"
+              src="{{ adhesion.logo.path | thumbnail: 200 | component_escape }}"
+              alt="{{ adhesion.title | escape_once }}" />
           </a>
         {%- else -%}
           <img
-            src="{{ adhesion.logo.path | thumbnail: 200 }}"
-            alt="{{ adhesion.title }}" />
+            loading="lazy"
+            width="200"
+            src="{{ adhesion.logo.path | thumbnail: 200 | component_escape }}"
+            alt="{{ adhesion.title | escape_once }}" />
         {%- endif -%}
       </div>
     {%- endfor -%}

data/_layouts/post.html

@@ -36,7 +36,7 @@ layout: default
     </p>
   </header>
 
-  <div class="e-content" itemprop="articleBody">
+  <div class="e-content content" itemprop="articleBody">
     {{ content }}
   </div>
 

data/_sass/content.scss

@@ -0,0 +1,116 @@
+.content {
+  p {
+    min-height: $font-size-base * $line-height-base;
+  }
+  h1 {
+    min-height: $h1-font-size * $headings-line-height;
+  }
+  h2 {
+    min-height: $h2-font-size * $headings-line-height;
+    text-transform: uppercase !important;
+    margin-top: 2rem;
+    margin-bottom: 1.5rem;
+    font-family: "Open Sans", sans-serif;
+    letter-spacing: 2.73px;
+  }
+
+  h3 {
+    min-height: $h3-font-size * $headings-line-height;
+    font-weight: $font-weight-bold;
+    margin: 2rem 0 1.5rem;
+  }
+
+  h4 {
+    min-height: $h4-font-size * $headings-line-height;
+  }
+  h5 {
+    min-height: $h5-font-size * $headings-line-height;
+  }
+  h6 {
+    min-height: $h6-font-size * $headings-line-height;
+  }
+
+  iframe {
+    border: 0;
+  }
+
+  audio {
+    width: 100%;
+  }
+
+  img,
+  video {
+    @extend .img-fluid;
+    height: auto;
+    margin: 2rem 0;
+  }
+
+  figure {
+    text-align: center;
+    margin: 0;
+  }
+
+  & > * {
+    margin-bottom: 1rem;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  li p {
+    margin-bottom: $paragraph-margin-bottom;
+  }
+
+  a {
+    text-decoration: underline !important;
+  }
+
+  sup {
+    position: relative;
+    @include font-size(100%);
+    line-height: 0;
+    vertical-align: baseline;
+    top: 0;
+    font-weight: bold;
+
+    &:before {
+      content: "[";
+    }
+
+    &:after {
+      content: "]";
+    }
+  }
+
+  blockquote {
+    border-left: 4px solid rgba(0, 0, 0, 0.2);
+    margin-left: 0.75em;
+    padding-left: 0.5em;
+  }
+
+  a {
+    word-break: break-word !important;
+    word-wrap: break-word !important;
+  }
+}
+
+footer .content a {
+  text-decoration: none !important;
+}
+
+small,
+.small {
+  @include font-size($small-font-size);
+  font-weight: unset;
+}
+
+.mw-100vw {
+  max-width: 100vw;
+}
+
+@media (min-width: 768px) {
+  .responsive-header {
+    min-height: $h1-font-size * $headings-line-height;
+  }
+}

data/assets/css/styles.scss

@@ -35,6 +35,7 @@ $theme-colors: (
 
 $border-width: 0.3rem;
 $border-color: $secondary;
+$navbar-light-color: $secondary;
 
 .font-bigger {
   font-size: 2rem !important;
@@ -61,11 +62,12 @@ $border-color: $secondary;
 @import "snap";
 @import "editor";
 @import "menu";
+@import "content";
 
 .callout {
   padding: 15px;
   margin: 25px 0;
-  border-left: 3px  solid #343a40;/*--gray-dark*/
+  border-left: 3px solid #343a40;
 }
 
 @include media-breakpoint-down('md') {

data/assets/js/env.js

@@ -0,0 +1,8 @@
+---
+---
+
+window.env = {
+  AIRBRAKE_PROJECT_ID: {{ site.env.AIRBRAKE_PROJECT_ID | default: 0 }},
+  AIRBRAKE_PROJECT_KEY: '{{ site.env.AIRBRAKE_PROJECT_KEY }}',
+  JEKYLL_ENV: '{{ site.env.JEKYLL_ENV }}'
+}