Skip to content

Commit 5bfef14

Browse files
committed
update grav
1 parent c3d39c5 commit 5bfef14

File tree

9 files changed

+934
-718
lines changed

9 files changed

+934
-718
lines changed

config/versions.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
core:
22
grav:
3-
version: 1.7.33
3+
version: 1.7.37.1
44
schema: 1.7.0_2020-11-20_1
55
history:
66
- { version: 1.7.33, date: '2022-05-05 10:09:31' }
7+
- { version: 1.7.37.1, date: '2022-12-12 16:11:48' }

themes/quark/CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
1+
# v2.0.4
2+
## 09/29/2021
3+
4+
1. [](#new)
5+
* Added simple gallery modular page for `lightbox-gallery` plugin
6+
2. [](#bugfix)
7+
* Fixed `radio` form field error when admin isn't installed
8+
* Translate `grid size` text
9+
10+
# v2.0.3
11+
## 06/08/2020
12+
13+
1. [](#improved)
14+
* Updated some JS libraries
15+
* Simplified navigation macro
16+
* Use `site.title` in logo alt text [#139](https://github.com/getgrav/grav-theme-quark/pull/109)
17+
118
# v2.0.2
219
## 08/09/2019
320

421
1. [](#improved)
522
* Allow for overriding of `{% block content %}{% endblock %}`
623
* Improved default `.table` styling
24+
* Simplified navigation macro
725
1. [](#bugfix)
826
* Fixed issue with Prism Highlight [prism-highlight#1](https://github.com/trilbymedia/grav-plugin-prism-highlight/issues/1)
927
* Use slug for onpage links [#115](https://github.com/getgrav/grav-theme-quark/issues/115)

themes/quark/blueprints.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
name: Quark
2-
version: 2.0.2
2+
slug: quark
3+
type: theme
4+
version: 2.0.4
35
description: New Grav Default Theme
4-
icon: microchip
6+
icon: microchip
57
author:
68
name: Team Grav
79
email: devs@getgrav.org
8-
url: http://getgrav.org
10+
url: https://getgrav.org
911
homepage: https://github.com/getgrav/grav-theme-quark
1012
demo: https://demo.getgrav.org/onepage-skeleton
1113
keywords: quark, spectre, theme, core, modern, fast, responsive, html5, css3
@@ -33,7 +35,7 @@ form:
3335

3436
grid-size:
3537
type: select
36-
label: Grid size
38+
label: THEME_QUARK.ADMIN.GRID_SIZE
3739
help: The maximum width of the theme
3840
size: small
3941
options:
@@ -171,4 +173,4 @@ form:
171173
1: PLUGIN_ADMIN.ENABLED
172174
0: PLUGIN_ADMIN.DISABLED
173175
validate:
174-
type: bool
176+
type: bool

themes/quark/languages.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
en:
22
THEME_QUARK:
3+
ADMIN:
4+
GRID_SIZE: Grid size
35
BLOG:
46
ITEM:
57
CONTINUE_READING: Continue reading...

themes/quark/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"devDependencies": {
2727
"gulp": "^4.0.0",
28-
"gulp-autoprefixer": "latest",
28+
"gulp-autoprefixer": "^6.1.0",
2929
"gulp-clean-css": "^3.9.4",
3030
"gulp-csscomb": "^3.0.8",
3131
"gulp-rename": "^1.2.2",

themes/quark/templates/forms/fields/radio/radio.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{% if required %}required="required"{% endif %}
2020
/>
2121
<i class="form-icon"></i>
22-
{% if grav.twig.twig.filters['tu'] is defined %}{{ text|tu|raw }}{% else %}{{ text|t|raw }}{% endif %}
22+
{{ text|t|raw }}
2323
</label>
2424
</div>
2525
{% endfor %}

themes/quark/templates/macros/macros.html.twig

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,15 @@
22
{% import _self as macros %}
33
{% for p in page.children.visible %}
44
{% set active_page = (p.active or p.activeChild) ? 'active' : '' %}
5-
{% if p.children.visible.count > 0 %}
6-
<li>
7-
<a href="{{ p.url }}" class="{{ active_page }}">
8-
{{ p.menu }}
9-
</a>
10-
<ul>
11-
{{ macros.nav_loop(p) }}
12-
</ul>
13-
</li>
14-
{% else %}
15-
<li>
16-
<a href="{{ p.url }}" class="{{ active_page }}">
17-
{{ p.menu }}
18-
</a>
19-
</li>
20-
{% endif %}
5+
<li>
6+
<a href="{{ p.url }}" class="{{ active_page }}">
7+
{{ p.menu }}
8+
</a>
9+
{% if p.children.visible.count > 0 %}
10+
<ul>
11+
{{ macros.nav_loop(p) }}
12+
</ul>
13+
{% endif %}
14+
</li>
2115
{% endfor %}
22-
{% endmacro %}
16+
{% endmacro %}

themes/quark/templates/partials/logo.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<a href="{{ home_url }}" class="navbar-brand mr-10">
33
{% if logo %}
44
{% set logo_file = (logo|first).name %}
5-
<img src="{{ url('theme://images/logo/' ~ logo_file) }}" alt="{{ site.name }}" />
5+
<img src="{{ url('theme://images/logo/' ~ logo_file) }}" alt="{{ site.title }}" />
66
{% else %}
77
{% include('@images/grav-logo.svg') %}
88
{% endif %}

0 commit comments

Comments
 (0)