Merge branch 'release/2.1.0'

getgrav · Jan 24, 2017 · 127710e · 127710e
2 parents 714f592 + a469c29
commit 127710e
Show file tree

Hide file tree

Showing 11 changed files with 2,716 additions and 696 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v2.1.0
+## 01/24/2017
+
+1. [](#new)
+    * Updated to FontAwesome 4.7.0 with [Grav icon](http://fontawesome.io/icon/grav/)
+1. [](#improved)
+    * Added croatian
+    * Changed "SimpleSearch" string in the sidebar to "Search"
+1. [](#bugfix)
+    * Removed unreachable condition [#85](https://github.com/getgrav/grav-theme-antimatter/pull/85)
+    * Fixed a typo in the french translation
+
 # v2.0.0
 ## 07/14/2016
 
@@ -6,7 +18,7 @@
 1. [](#improved)
     * Updated to FontAwesome 4.6.3
     * Added romanian, russian and ukranian
-    
+
 # v2.0.0-beta.1
 ## 05/23/2016
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Antimatter
-version: 2.0.0
+version: 2.1.0
 description: "Antimatter is the default theme included with **Grav**"
 icon: empire
 author:

diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2
diff --git a/languages.yaml b/languages.yaml
@@ -7,7 +7,7 @@ en:
       PREV_POST: Previous Post
   SIDEBAR:
     SIMPLE_SEARCH:
-      HEADLINE: SimpleSearch
+      HEADLINE: Search
     RELATED_POSTS:
       HEADLINE: Related Posts
     RANDOM_ARTICLE:
@@ -93,7 +93,7 @@ fr:
       HEADLINE: Articles en relation
     RANDOM_ARTICLE:
       HEADLINE: Article aléatoire
-      FEELING_LUCKY: J'ai de la chance !
+      FEELING_LUCKY: J’ai de la chance !
     SOME_TEXT_WIDGET:
       HEADLINE: Du texte gadget
     POPULAR_TAGS:
@@ -103,7 +103,7 @@ fr:
     SYNDICATE:
       HEADLINE: Syndication
   FORM_DATA:
-    SUMMARY: "Voici le résumé de ce que vous avez écrit pour nous:"
+    SUMMARY: "Voici le résumé de ce que vous avez écrit pour nous :"
   ERROR: Erreur
 
 it:
@@ -212,3 +212,31 @@ uk:
   FORM_DATA:
     SUMMARY: "Ви написали нам:"
   ERROR: Помилка
+
+hr:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Nastavi s čitanjem...
+      NEXT_POST: Slijedeća objava
+      PREV_POST: Prethodna objava
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Pretraživanje
+    RELATED_POSTS:
+      HEADLINE: Povezane objave
+    RANDOM_ARTICLE:
+      HEADLINE: Slučajni članak
+      FEELING_LUCKY: Osjećam se sretno!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Neki tekst widget
+    POPULAR_TAGS:
+      HEADLINE: Popularni tagovi
+    ARCHIVES:
+      HEADLINE: Arhiva
+    SYNDICATE:
+      HEADLINE: Kanali
+  FORM_DATA:
+    SUMMARY: "Ovo je sažetak onog što ste nam napisali:"
+  ERROR: Greška
+
diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig
@@ -57,13 +57,7 @@
         </div>
     {% elseif truncate %}
         <div class="p-summary e-content">
-            {% if page.summary != page.content %}
-                    {{ page.content|truncate(550) }}
-                </div>
-            {% else %}
-                    {{ page.content }}
-
-            {% endif %}
+            {{ page.content }}
             <p><a href="{{ page.url }}">{{ 'BLOG.ITEM.CONTINUE_READING'|t }}</a></p>
         </div>
     {% else %}