Merge branch 'master' into feature/i18n_redirect

decidim · Oct 6, 2017 · 1d342d4 · 1d342d4
2 parents b5fbd59 + e8d08fe
commit 1d342d4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/source/localizable/community.ca.html.erb b/source/localizable/community.ca.html.erb
@@ -1,10 +1,10 @@
----
+---
 title: Comunitat | Decidim
 description:
 ---
 <div class="container container--text-col container--center container-vertical-top">
   <h1>Troba la manera d&apos;unir-te a la comunitat</h1>
-	<p>Som el domini públic digital de la democràcia participativa.</p>
+  <p>Som el domini públic digital de la democràcia participativa.</p>
 </div>
 
 <div class="container">

diff --git a/source/localizable/community.es.html.erb b/source/localizable/community.es.html.erb
@@ -1,10 +1,10 @@
----
+---
 title: Comunidad | Decidim
 description:
 ---
 <div class="container container--text-col container--center container-vertical-top">
   <h1>Encuentra la manera de unirte a la comunidad</h1>
-	<p>Somos la base digital común para la democracia participativa.</p>
+  <p>Somos la base digital común para la democracia participativa.</p>
 </div>
 
 <div class="container">

diff --git a/source/localizable/community.html.erb b/source/localizable/community.html.erb
@@ -4,7 +4,7 @@ description:
 ---
 <div class="container container--text-col container--center container-vertical-top">
   <h1>Find your way to join the community</h1>
-	<p>We are the digital commons for participatory democracy.</p>
+  <p>We are the digital commons for participatory democracy.</p>
 </div>
 
 <div class="container">

diff --git a/source/localizable/demo.es.html.erb b/source/localizable/demo.es.html.erb
@@ -1,7 +1,7 @@
---
+---
 title: Demo | Decidim
 description:
---
+---
 <div class="container container--text-col container-vertical-top">
   <h1>Demo en línea</h1>
   <p>

diff --git a/source/partials/navigation.html.erb b/source/partials/navigation.html.erb
@@ -17,10 +17,10 @@
     <a href="<%= t(:path) %>/demo" class="main-nav__item"><%= t(:navDemo) %></a>
     <a href="<%= t(:path) %>/community" class="main-nav__item"><%= t(:navCommunity) %></a>
     <a href="<%= t(:path) %>/contract"class="main-nav__item"><%= t(:navContract) %></a>
+    <a href="<%= t(:path) %>/blog"class="main-nav__item"><%= t(:navBlog) %></a>
     <a href="https://github.com/decidim/decidim" target="_blank" class="main-nav__item">
       <%= t(:navCode) %>
     </a>
-    <a href="<%= t(:path) %>/blog"class="main-nav__item"><%= t(:navBlog) %></a>
   </div>
     <a class="main-nav__trigger" href="#nav-links">
       <span class="nav-icon"></span>