From 058d04ded5e772d048a1e04e0a661a2781b91687 Mon Sep 17 00:00:00 2001 From: NicoHood Date: Mon, 1 Feb 2021 19:23:44 +0100 Subject: [PATCH 1/5] Use https (#174) --- blueprints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints.yaml b/blueprints.yaml index 3f4fe8f..0596bf3 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -3,11 +3,11 @@ slug: quark type: theme version: 2.0.3 description: New Grav Default Theme -icon: microchip +icon: microchip author: name: Team Grav email: devs@getgrav.org - url: http://getgrav.org + url: https://getgrav.org homepage: https://github.com/getgrav/grav-theme-quark demo: https://demo.getgrav.org/onepage-skeleton keywords: quark, spectre, theme, core, modern, fast, responsive, html5, css3 @@ -173,4 +173,4 @@ form: 1: PLUGIN_ADMIN.ENABLED 0: PLUGIN_ADMIN.DISABLED validate: - type: bool \ No newline at end of file + type: bool From 88d1249261c0cba264b143692a53a63f9450c784 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 15 Jun 2021 11:26:16 -0600 Subject: [PATCH 2/5] translate grid size --- blueprints.yaml | 2 +- languages.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/blueprints.yaml b/blueprints.yaml index 0596bf3..f2389e4 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -35,7 +35,7 @@ form: grid-size: type: select - label: Grid size + label: THEME_QUARK.ADMIN.GRID_SIZE help: The maximum width of the theme size: small options: diff --git a/languages.yaml b/languages.yaml index 79f4649..8de495a 100644 --- a/languages.yaml +++ b/languages.yaml @@ -1,5 +1,7 @@ en: THEME_QUARK: + ADMIN: + GRID_SIZE: Grid size BLOG: ITEM: CONTINUE_READING: Continue reading... From 476800547df6542b1448668a6220f450dfab14e9 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 2 Sep 2021 20:13:53 +0300 Subject: [PATCH 3/5] Fixed `radio` form field error when admin isn't installed --- CHANGELOG.md | 6 ++++++ templates/forms/fields/radio/radio.html.twig | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fd5f21..9e33057 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v2.0.4 +## mm/dd/2021 + +1. [](#bugfix) + * Fixed `radio` form field error when admin isn't installed + # v2.0.3 ## 06/08/2020 diff --git a/templates/forms/fields/radio/radio.html.twig b/templates/forms/fields/radio/radio.html.twig index 5698f36..ecda8f4 100644 --- a/templates/forms/fields/radio/radio.html.twig +++ b/templates/forms/fields/radio/radio.html.twig @@ -19,7 +19,7 @@ {% if required %}required="required"{% endif %} /> - {% if grav.twig.twig.filters['tu'] is defined %}{{ text|tu|raw }}{% else %}{{ text|t|raw }}{% endif %} + {{ text|t|raw }} {% endfor %} From 28b5325cf3e71e14c3c15632d6b2d7f6c3200acd Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 2 Sep 2021 11:20:32 -0600 Subject: [PATCH 4/5] Added a simple gallery modular --- templates/modular/gallery.html.twig | 83 +++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 templates/modular/gallery.html.twig diff --git a/templates/modular/gallery.html.twig b/templates/modular/gallery.html.twig new file mode 100644 index 0000000..66fdc96 --- /dev/null +++ b/templates/modular/gallery.html.twig @@ -0,0 +1,83 @@ +{% set styling %} +.lightbox-gallery { + max-width: 1200px; + margin: 0 auto; + padding: 0 20px; +} + +.lightbox-gallery .lightbox-gallery__columns { + display: flex; + flex-wrap: wrap; + margin: 0 -10px; +} + +.lightbox-gallery .lightbox-gallery__column { + width: 50%; + padding: 0 10px; + margin-bottom: 20px; +} + +.lightbox-gallery img { + display: block; + border-radius: 5px; + transition: all .2s ease-in-out; +} + +.lightbox-gallery img:hover { + filter: brightness(60%); + transform: scale(1.05); +} + +@media only screen and (min-width: 600px) { + .lightbox-gallery .lightbox-gallery__column { + width: calc(100% / 3); + } +} + +@media only screen and (min-width: 1000px) { + .lightbox-gallery .lightbox-gallery__column { + width: 25%; + } +} + +.lightbox-gallery .hidden { + display: none; +} +{% endset %} + +{% do assets.addInlineCss(styling) %} + +{% block module_content %} + {% set data = page.header.gallery %} + {% set thumb_width = data.thumb.width|default(600) %} + {% set thumb_height = data.thumb.height|default(450) %} + +
+
+ {% set gallery = md5(page.url) %} + {% for item in data.items %} +
+ {% set item_image = page.media[item.image] %} + {% if item.title %} + {% set title = item.title %} + {% endif %} + {% if item.desc %} + {% set desc = ".desc-" ~ md5(item.desc) %} + {% endif %} + {% set content = item_image.cropZoom(thumb_width,thumb_height).html(title, title) %} + {% set image = item_image.url %} + {% include "partials/lightbox.html.twig" %} +
+ {% endfor %} +
+ +
+{% endblock %} From dfff2a5efb54520bf05e65770951d00e703e95b1 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 29 Sep 2021 11:12:41 -0600 Subject: [PATCH 5/5] prepare for release --- CHANGELOG.md | 7 +++++-- blueprints.yaml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e33057..a758007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # v2.0.4 -## mm/dd/2021 +## 09/29/2021 -1. [](#bugfix) +1. [](#new) + * Added simple gallery modular page for `lightbox-gallery` plugin +2. [](#bugfix) * Fixed `radio` form field error when admin isn't installed + * Translate `grid size` text # v2.0.3 ## 06/08/2020 diff --git a/blueprints.yaml b/blueprints.yaml index f2389e4..24da111 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,7 +1,7 @@ name: Quark slug: quark type: theme -version: 2.0.3 +version: 2.0.4 description: New Grav Default Theme icon: microchip author: