Merge 3e73db2 into 85d56ed

bartfeenstra · Nov 17, 2022 · ce428d9 · ce428d9
2 parents 85d56ed + 3e73db2
commit ce428d9
Show file tree

Hide file tree

Showing 44 changed files with 621 additions and 715 deletions.
diff --git a/babel.ini b/babel.ini
@@ -2,4 +2,4 @@
 
 [jinja2: **.j2]
 encoding = utf-8
-extensions = jinja2.ext.do, betty.jinja2._ContextManagerExtension
+extensions = jinja2.ext.do, jinja2.ext.loopcontrols, betty.jinja2._ContextManagerExtension
diff --git a/betty/assets/betty.pot b/betty/assets/betty.pot
@@ -88,7 +88,7 @@ msgstr ""
 msgid "A citation is available, but has not been published in order to protect people's privacy"
 msgstr ""
 
-msgid "A family history as told by <a href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
+msgid "A family history as told by <a href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
 msgstr ""
 
 msgid "A locale name."
@@ -410,6 +410,9 @@ msgstr ""
 msgid "Generating your site..."
 msgstr ""
 
+msgid "Go to the front page"
+msgstr ""
+
 msgid "Gramps configuration must be a mapping (dictionary)."
 msgstr ""
 

diff --git a/betty/assets/locale/fr_FR/LC_MESSAGES/betty.po b/betty/assets/locale/fr_FR/LC_MESSAGES/betty.po
@@ -113,10 +113,10 @@ msgstr ""
 
 msgid ""
 "A family history as told by <a "
-"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
+"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
 msgstr ""
 "Une histoire familiale racontée par<a "
-"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
+"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
 
 msgid "A locale name."
 msgstr "Un nom de language."
@@ -491,6 +491,9 @@ msgstr ""
 msgid "Generating your site..."
 msgstr ""
 
+msgid "Go to the front page"
+msgstr ""
+
 msgid "Gramps configuration must be a mapping (dictionary)."
 msgstr ""
 

diff --git a/betty/assets/locale/nl_NL/LC_MESSAGES/betty.po b/betty/assets/locale/nl_NL/LC_MESSAGES/betty.po
@@ -67,7 +67,7 @@ msgid "\"{extension_type_name}\" is not a Betty extension."
 msgstr "\"{extension_type_name}\" is geen Betty-extensie."
 
 msgid "\"{hex_value}\" is not a valid hexadecimal color, such as #ffc0cb."
-msgstr ""
+msgstr "\"{hex_value}\" is geen geldige hexadecimale kleurcode, zoals #ffc0cb."
 
 #, python-format
 msgid "%(date)s"
@@ -123,10 +123,10 @@ msgstr ""
 
 msgid ""
 "A family history as told by <a "
-"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
+"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
 msgstr ""
 "Een familieverhaal verteld door <a "
-"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
+"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
 
 msgid "A locale name."
 msgstr "De naam van een locale."
@@ -520,6 +520,9 @@ msgstr ""
 msgid "Generating your site..."
 msgstr "Je site aan het genereren..."
 
+msgid "Go to the front page"
+msgstr "Ga naar de voorpagina"
+
 msgid "Gramps configuration must be a mapping (dictionary)."
 msgstr "De Gramps-configuratie moet een mapping (dictionary) zijn."
 

diff --git a/betty/assets/locale/uk/LC_MESSAGES/betty.po b/betty/assets/locale/uk/LC_MESSAGES/betty.po
@@ -113,10 +113,10 @@ msgstr ""
 
 msgid ""
 "A family history as told by <a "
-"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
+"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
 msgstr ""
 "Сімейна історія, яку розповіла <a "
-"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
+"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
 
 msgid "A locale name."
 msgstr ""
@@ -485,6 +485,9 @@ msgstr ""
 msgid "Generating your site..."
 msgstr ""
 
+msgid "Go to the front page"
+msgstr ""
+
 msgid "Gramps configuration must be a mapping (dictionary)."
 msgstr ""
 

diff --git a/betty/assets/templates/head.html.j2 b/betty/assets/templates/head.html.j2
@@ -1,28 +1,28 @@
 <title>{% if page_title is defined %}{{ page_title | striptags }} - {% endif %}{{ app.project.configuration.title }}</title>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="generator" content="Betty (https://github.com/bartfeenstra/betty)"/>
+<meta name="generator" content="Betty (https://github.com/bartfeenstra/betty)">
 {% if app.project.configuration.author %}
-    <meta name="author" content="{{ app.project.configuration.author }}"/>
+    <meta name="author" content="{{ app.project.configuration.author }}">
 {% endif %}
-<meta name="og:title" content="{%- if page_title is defined -%}{{ page_title | striptags }}{%- else -%}{{ app.project.configuration.title }}{%- endif -%}"/>
-<meta name="og:site_name" content="{{ app.project.configuration.title }}"/>
+<meta name="og:title" content="{%- if page_title is defined -%}{{ page_title | striptags }}{%- else -%}{{ app.project.configuration.title }}{%- endif -%}">
+<meta name="og:site_name" content="{{ app.project.configuration.title }}">
 {% if page_resource is defined %}
     {% if page_recource is has_files %}
         {% for file in page_resource.files %}
             {% if file.media_type.type == 'image' %}
-                <meta name="og:image" content="{{ file | image(600, 600) | static_url }}"/>
+                <meta name="og:image" content="{{ file | image(600, 600) | static_url }}">
                 {% if file.description %}
-                    <meta name="og:image:description" content="{{ file.description | escape }}"/>
+                    <meta name="og:image:description" content="{{ file.description | escape }}">
                 {% endif %}
             {% endif %}
         {% endfor %}
     {% endif %}
-    <link rel="canonical" href="{{ page_resource | url(absolute=true) }}" hreflang="{{ app.locale }}" type="text/html"/>
+    <link rel="canonical" href="{{ page_resource | url(absolute=true) }}" hreflang="{{ app.locale }}" type="text/html">
     {% for locale_configuration in app.project.configuration.locales %}
         {% if locale_configuration.locale != app.locale %}
             {% enter app.acquire_locale(locale_configuration.locale) %}
-                <link rel="alternate" href="{{ page_resource | url }}" hreflang="{{ locale_configuration.locale }}" type="text/html"/>
+                <link rel="alternate" href="{{ page_resource | url }}" hreflang="{{ locale_configuration.locale }}" type="text/html">
             {% exit %}
         {% endif %}
     {% endfor %}
@@ -33,15 +33,15 @@
         {% set current_locale = app.locale %}
         {% for locale_configuration in app.project.configuration.locales %}
             {% enter app.acquire_locale(locale_configuration.locale) %}
-                <link rel="alternate" href="{{ page_resource | url(media_type='application/json') }}" hreflang="{{ locale_configuration.locale }}" type="application/json"/>
+                <link rel="alternate" href="{{ page_resource | url(media_type='application/json') }}" hreflang="{{ locale_configuration.locale }}" type="application/json">
             {% exit %}
         {% endfor %}
     {% endif %}
 {% endif %}
-<meta name="og:image" content="/betty-512x512.png"/>
-<link rel="icon" href="{{ '/betty.ico' | static_url }}"/>
+<meta name="og:image" content="/betty-512x512.png">
+<link rel="icon" href="{{ '/betty.ico' | static_url }}">
 {% for css_path in public_css_paths %}
-    <link rel="stylesheet" href="{{ css_path }}"/>
+    <link rel="stylesheet" href="{{ css_path }}">
 {% endfor %}
 {% for js_path in public_js_paths %}
     <script src="{{ js_path }}" defer></script>

diff --git a/betty/cotton_candy/assets/betty.npm._Npm/src/accessibility.scss b/betty/cotton_candy/assets/betty.npm._Npm/src/accessibility.scss
@@ -1,18 +1,3 @@
-.visually-hidden,
 .with-js .js-visually-hidden {
-  border: 0;
-  clip: rect(0 0 0 0);
-  clip-path: inset(50%);
-  height: 1px;
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  white-space: nowrap;
-  width: 1px;
-}
-
-.tooltip {
-  cursor: help;
-  text-decoration: dotted underline;
+  @extend .visually-hidden;
 }
diff --git a/betty/cotton_candy/assets/betty.npm._Npm/src/entity.scss b/betty/cotton_candy/assets/betty.npm._Npm/src/entity.scss
@@ -12,63 +12,3 @@
 .entities li.even {
   background-color: #f7f7f7;
 }
-
-.featured-entities {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-}
-
-.featured-entity {
-  height: 500px;
-}
-
-.featured-entity h2 {
-  margin: 0;
-}
-
-.featured-entity-intro {
-  height: calc(30% - 2rem);
-  padding: 1rem;
-  width: calc(100% - 2rem);
-}
-
-.featured-entity-feature {
-  height: 70%;
-  width: 100%;
-}
-
-.featured-entity-feature-link {
-  display: block;
-  height: 100%;
-  width: 100%;
-}
-
-.featured-entity-feature img {
-  height: 350px;
-  object-fit: cover;
-  width: 100%;
-}
-
-@media (min-width: 900px) {
-  .featured-entities {
-    grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));
-  }
-
-  .featured-entity {
-    height: 750px;
-  }
-
-  .featured-entity-intro {
-    height: calc(20% - 2rem);
-    padding: 1rem 3rem;
-    width: calc(100% - 6rem);
-  }
-
-  .featured-entity-feature {
-    height: 80%;
-  }
-
-  .featured-entity-feature img {
-    height: 600px;
-  }
-}
diff --git a/betty/cotton_candy/assets/betty.npm._Npm/src/feature.scss b/betty/cotton_candy/assets/betty.npm._Npm/src/feature.scss
@@ -0,0 +1,9 @@
+.featured {
+  margin: 0 -1rem;
+  width: calc(100% + 2rem);
+}
+
+.featured-cards {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+}
diff --git a/betty/cotton_candy/assets/betty.npm._Npm/src/main.scss b/betty/cotton_candy/assets/betty.npm._Npm/src/main.scss
@@ -1,12 +1,59 @@
+@import "~bootstrap/scss/functions";
+
+// Default variable overrides.
+@import "variables.scss";
+@import "~bootstrap/scss/variables";
+
+// Default map overrides.
+// ...
+
+@import "~bootstrap/scss/maps";
+@import "~bootstrap/scss/mixins";
+@import "~bootstrap/scss/root";
+@import "~bootstrap/scss/reboot";
+@import "~bootstrap/scss/utilities";
+@import "~bootstrap/scss/type";
+@import "~bootstrap/scss/images";
+@import "~bootstrap/scss/containers";
+@import "~bootstrap/scss/grid";
+@import "~bootstrap/scss/tables";
+@import "~bootstrap/scss/forms";
+@import "~bootstrap/scss/buttons";
+@import "~bootstrap/scss/transitions";
+@import "~bootstrap/scss/dropdown";
+@import "~bootstrap/scss/button-group";
+@import "~bootstrap/scss/nav";
+@import "~bootstrap/scss/navbar";
+@import "~bootstrap/scss/card";
+@import "~bootstrap/scss/accordion";
+@import "~bootstrap/scss/breadcrumb";
+@import "~bootstrap/scss/pagination";
+@import "~bootstrap/scss/badge";
+@import "~bootstrap/scss/alert";
+@import "~bootstrap/scss/progress";
+@import "~bootstrap/scss/list-group";
+@import "~bootstrap/scss/close";
+@import "~bootstrap/scss/toasts";
+@import "~bootstrap/scss/modal";
+@import "~bootstrap/scss/tooltip";
+@import "~bootstrap/scss/popover";
+@import "~bootstrap/scss/carousel";
+@import "~bootstrap/scss/spinners";
+@import "~bootstrap/scss/offcanvas";
+@import "~bootstrap/scss/placeholders";
+@import "~bootstrap/scss/helpers";
+@import "~bootstrap/scss/utilities/api";
 @import "accessibility.scss";
 @import "citation.scss";
 @import "entity.scss";
+@import "feature.scss";
 @import "file.scss";
 @import "meta.scss";
+@import "navigation";
 @import "overlay.scss";
-@import "page.scss";
 @import "permalink.scss";
 @import "person.scss";
 @import "search.scss";
 @import "show.scss";
 @import "text.scss";
+