Remove theme from gitignore & add .html to imports

Also change extension from verbose nunjucks to just nunj

Remove theme from gitignore & add .html to imports
f61467a7 · Isabella Skořepová · 7f8ec3d5 · f61467a7 · f61467a7 · f61467a7
Verified Commit f61467a7 authored 9 years ago by Isabella Skořepová
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,5 @@ coverage
 build
 build-debug
 content
-theme
 static
 .buildconfig
--- a/theme/templates/404.html.nunjucks
+++ b/theme/templates/404.html.nunjucks
--- a/theme/templates/article.html.nunjucks
+++ b/theme/templates/article.html.nunjucks
-{% include "partials/header" %}
+{% include "partials/header.html" %}
  <div class="section container" id="content">
    <div class="metadata">
      <h2 id="title">{{ metadata.title }}</h2>
@@ -30,4 +30,4 @@
      </p>
    </article>
  </div>
-{% include "partials/footer" %}
+{% include "partials/footer.html" %}
--- a/theme/templates/gallery.html.nunjucks
+++ b/theme/templates/gallery.html.nunjucks
-{{ include "partials/header.html" }}
-  
-{{ include "partials/footer.html" }}
--- a/theme/templates/partials/footer.html.nunjucks
+++ b/theme/templates/partials/footer.html.nunjucks
--- a/theme/templates/partials/header.html.nunjucks
+++ b/theme/templates/partials/header.html.nunjucks
@@ -39,7 +39,7 @@
  {{ metadata.headerextra | safe }}
 </head>
 <body {{ "class=type-article" if type=="article" }}>
-  {% import "partials/svgs" as svgs %}
+  {% import "partials/svgs.html" as svgs %}
  <div id="all">
    <!-- Top nav -->
    <nav class="supernav" role="navigation" style="z-index:5;position:absolute;">
@@ -141,5 +141,4 @@
        </ul>
      </div>
    </nav>
-    {% include "partials/search" %}
-      
+    {% include "partials/search.html" %}
--- a/theme/templates/partials/list.html.nunjucks
+++ b/theme/templates/partials/list.html.nunjucks
-{% import "partials/svgs" as svgs %}
+{% import "partials/svgs.html" as svgs %}
  <div id=content class=container>
    <div class="section">
      <div class="row">
@@ -35,8 +35,8 @@
          </div>
        {% endfor %}
      </div>
-      
-      {% include "partials/paginator" %}
+
+      {% include "partials/paginator.html" %}
    </div>

    <div class="hide-on-small-only">
@@ -62,21 +62,21 @@
           if ($(this).height() > maxHeight) { maxHeight = $(this).height(); }
        });
        $(".head-perex").height(maxHeight);
-        
+
        $(".head-title").height("auto");
        maxHeight = 0;
        $(".head-title").each(function(){
           if ($(this).height() > maxHeight) { maxHeight = $(this).height(); }
        });
        $(".head-title").height(maxHeight);
-        
+
        $(".head-info").height("auto");
        maxHeight = 0;
        $(".head-info").each(function(){
           if ($(this).height() > maxHeight) { maxHeight = $(this).height(); }
        });
        $(".head-info").height(maxHeight);
-        
+
        // Sidelink icons of same size
        $(".sidelink-icon").css("top",$(window).height()/2);
      };

--- a/theme/templates/partials/paginator.html.nunjucks
+++ b/theme/templates/partials/paginator.html.nunjucks
-{% import "partials/svgs" as svgs %}
+{% import "partials/svgs.html" as svgs %}

 <ul class="pagination">
  <li><a {{ (" href=\""+config.baseurl +"/"+ metadata.firstpage.file +"\"") | safe if metadata.firstpage.file != file }}>
@@ -17,9 +17,8 @@
  <li><a {{ " href="+config.baseurl +"/"+ metadata.nextpage.file if metadata.nextpage != undefined }}>
    {{ svgs.chevronright( "#999" if metadata.nextpage == undefined else "#000", 1,"em" ) }}
  </a></li>
-  
+
  <li><a {{ (" href=\""+config.baseurl +"/"+ metadata.lastpage.file +"\"") | safe if metadata.lastpage.file != file }}>
    {{ svgs.doublechevronright( "#999" if metadata.lastpage.file == file else "#000", 1,"em" ) }}
  </a></li>
 </ul>
-
--- a/theme/templates/partials/search.html.nunjucks
+++ b/theme/templates/partials/search.html.nunjucks
--- a/theme/templates/partials/svgs.html.nunjucks
+++ b/theme/templates/partials/svgs.html.nunjucks
--- a/theme/templates/redirect.html.nunjucks
+++ b/theme/templates/redirect.html.nunjucks
--- a/theme/templates/tag.html.nunj
+++ b/theme/templates/tag.html.nunj
+{% include "partials/header.html" %}
+{% include "partials/list.html" %}
+{% include "partials/footer.html" %}
--- a/theme/templates/tag.html.nunjucks
+++ b/theme/templates/tag.html.nunjucks
-{% include "partials/header" %}
-{% include "partials/list" %}
-{% include "partials/footer" %}