Merge branch 'release/2.0.1'

getgrav · May 9, 2019 · 5a9ff09 · 5a9ff09
2 parents a4de997 + c365946
commit 5a9ff09
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# v2.0.1
+## 05/09/2019
+
+1. [](#improved)
+ * Typo in blueprints [#109](https://github.com/getgrav/grav-theme-quark/pull/109)
+ * Added convenience scripts to `package.json` [#110](https://github.com/getgrav/grav-theme-quark/pull/110)
+ * Added Czech translation [#106](https://github.com/getgrav/grav-theme-quark/pull/106)
+ * Added Chinese translation [#114](https://github.com/getgrav/grav-theme-quark/pull/114)
+ * Removed redundant code [#104](https://github.com/getgrav/grav-theme-quark/pull/104)
+ * Updated to match Archives plugin translation output
+1. [](#bugfix)
+ * Bugfix to class in macro [#105](https://github.com/getgrav/grav-theme-quark/pull/105)
+ * Bugfix a z-index issue [#75](https://github.com/getgrav/grav-theme-quark/pull/75)
+
 # v2.0.0
 ## 04/11/2019
 
@@ -25,7 +39,7 @@
 1. [](#improved)
  * Updated [Spectre.css](https://picturepan2.github.io/spectre/) to latest `0.5.7` version
 1. [](#bugfix)
- * Fixed missing `</html>` close tag in bae template [#76](https://github.com/getgrav/grav-theme-quark/pull/) 
+ * Fixed missing `</html>` close tag in bae template [#76](https://github.com/getgrav/grav-theme-quark/pull/76) 
 
 # v1.2.4
 ## 11/12/2018

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Quark
-version: 2.0.0
+version: 2.0.1
 description: New Grav Default Theme
 icon: microchip
 author:

diff --git a/blueprints/item.yaml b/blueprints/item.yaml
@@ -89,7 +89,7 @@ form:
  label: Format
  classes: fancy
  options:
- 'short': 'Use the first occurence of delimter or size'
+ 'short': 'Use the first occurence of delimiter or size'
  'long': 'Summary delimiter will be ignored'
 
  header.summary.size:

diff --git a/css-compiled/theme.css b/css-compiled/theme.css
diff --git a/css-compiled/theme.min.css b/css-compiled/theme.min.css
diff --git a/languages.yaml b/languages.yaml
@@ -238,3 +238,51 @@ nl:
  HEADLINE: Archieven
  SYNDICATE:
  HEADLINE: Syndicatie
+
+cs:
+ THEME_QUARK:
+ BLOG:
+ ITEM:
+ CONTINUE_READING: Pokračovat ve čtení...
+ NEXT_POST: Následující příspěvek
+ PREV_POST: Předchozí příspěvek
+ SIDEBAR:
+ SIMPLE_SEARCH:
+ HEADLINE: Vyhledávání
+ RELATED_POSTS:
+ HEADLINE: Související příspěvky
+ RANDOM_ARTICLE:
+ HEADLINE: Náhodný článek
+ FEELING_LUCKY: Zkusím štěstí!
+ SOME_TEXT_WIDGET:
+ HEADLINE: Textový widget
+ POPULAR_TAGS:
+ HEADLINE: Oblíbené štítky
+ ARCHIVES:
+ HEADLINE: Archiv
+ SYNDICATE:
+ HEADLINE: Syndikace
+
+zh:
+ THEME_QUARK:
+ BLOG:
+ ITEM:
+ CONTINUE_READING: 继续阅读...
+ NEXT_POST: 下一篇
+ PREV_POST: 上一篇
+ SIDEBAR:
+ SIMPLE_SEARCH:
+ HEADLINE: 搜索
+ RELATED_POSTS:
+ HEADLINE: 相关内容
+ RANDOM_ARTICLE:
+ HEADLINE: 随机一篇
+ FEELING_LUCKY: 手气不错!
+ SOME_TEXT_WIDGET:
+ HEADLINE: 一个文本小部件
+ POPULAR_TAGS:
+ HEADLINE: 热门标签
+ ARCHIVES:
+ HEADLINE: 归档
+ SYNDICATE:
+ HEADLINE: 订阅流
diff --git a/package.json b/package.json
@@ -39,6 +39,10 @@
  "last 4 Opera versions",
  "Explorer >= 10"
  ],
+ "scripts": {
+ "dev": "gulp watch",
+ "build": "gulp build"
+ },
  "dependencies": {
  "gulp-sourcemaps": "^2.6.4"
  }

diff --git a/scss/theme/_blog.scss b/scss/theme/_blog.scss
@@ -92,6 +92,7 @@ ul.pagination {
  ul.related-pages {
  box-shadow: none;
  padding: 0;
+ z-index: 1;
 
  li {
  border-bottom: 1px solid $border-color;
@@ -110,4 +111,4 @@ ul.pagination {
  vertical-align: text-top;
  }
  }
-}
+}
diff --git a/templates/macros/macros.html.twig b/templates/macros/macros.html.twig
@@ -4,7 +4,7 @@
  {% set active_page = (p.active or p.activeChild) ? 'active' : '' %}
  {% if p.children.visible.count > 0 %}
  <li>
- <a href="{{ p.url }}"{{ active_page }}>
+ <a href="{{ p.url }}" class="{{ active_page }}">
  {{ p.menu }}
  </a>
  <ul>
@@ -13,7 +13,7 @@
  </li>
  {% else %}
  <li>
- <a href="{{ p.url }}" class="{{ active_page }} ">
+ <a href="{{ p.url }}" class="{{ active_page }}">
  {{ p.menu }}
  </a>
  </li>

diff --git a/templates/modular/text.html.twig b/templates/modular/text.html.twig
@@ -9,9 +9,7 @@
  {{ content|raw }}
  </div>
  <div class="column col-6 col-md-12">
- {% if image %}
- {{ image.html|raw }}
- {% endif %}
+ {{ image.html|raw }}
  </div>
  {% else %}
  <div class="column col-12">

diff --git a/templates/partials/archives.html.twig b/templates/partials/archives.html.twig
@@ -6,7 +6,7 @@
  {% if archives_show_count %}
  <span class="label label-rounded label-primary">{{ items|length }}</span>
  {% endif %}
- <span class="archive_date">{{ month }}</span>
+  <span class="archive_date">{{ month|date(config.plugins.archives.date_display_format) }} </span>
  </a>
  </li>
 {% endfor %}

diff --git a/templates/partials/hero.html.twig b/templates/partials/hero.html.twig
@@ -1,7 +1,7 @@
-<section id="{{ id }}" class="section modular-hero hero {{ page.header.hero_classes }} {{ page.header.background.parallax ? 'parallax' : '' }}" {% if hero_image %}style="background-image: url({{ hero_image.url }});"{% endif %}>
+<section id="{{ id }}" class="section modular-hero hero {{ page.header.hero_classes }} {{ page.header.background.parallax ? 'parallax' : '' }}" {% if hero_image %}style="background-image: url('{{ hero_image.url }}');"{% endif %}>
  <div class="image-overlay"></div>
  <section class="container {{ grid_size }}" style="text-align: {{ page.header.hero_align|default('center') }}">
  {{ content|raw }}
  </section>
  <i id="to-start" class="pulse fa fa-angle-down"></i>
-</section>
+</section>