Fix icons and build due to jinja changes

squidfunk · Jan 8, 2017 · 6d01f17 · 6d01f17
1 parent 03604c5
commit 6d01f17
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/material/assets/stylesheets/application-96d55a1439.css b/material/assets/stylesheets/application-96d55a1439.css
diff --git a/material/assets/stylesheets/application-a2651bb338.css b/material/assets/stylesheets/application-a2651bb338.css
diff --git a/material/base.html b/material/base.html
@@ -37,7 +37,7 @@
       {% include "partials/fonts.html" %}
     {% endblock %}
     {% block styles %}
-      <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-a2651bb338.css">
+      <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-96d55a1439.css">
       {% if config.extra.palette %}
         <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-02ce7adcc2.palette.css">
       {% endif %}

diff --git a/material/partials/nav-item.html b/material/partials/nav-item.html
@@ -13,11 +13,11 @@
         {{ nav_item.title}}
       </label>
       <ul class="md-nav__list" data-md-scrollfix>
+        {% set base = path %}
         {% for nav_item in nav_item.children %}
-          {% set temp = path %}
-          {% set path = path + "-" + loop.index | string %}
-          {% include "partials/nav-item.html" %}
-          {% set path = temp %}
+          {% with path = base + "-" + loop.index | string %}
+            {% include "partials/nav-item.html"  %}
+          {% endwith %}
         {% endfor %}
       </ul>
     </nav>

diff --git a/material/partials/nav.html b/material/partials/nav.html
@@ -16,8 +16,9 @@
   {% endif %}
   <ul class="md-nav__list" data-md-scrollfix>
     {% for nav_item in nav %}
-      {% set path = "nav-" + loop.index | string %}
-      {% include "partials/nav-item.html" %}
+      {% with path = "nav-" + loop.index | string %}
+        {% include "partials/nav-item.html" %}
+      {% endwith %}
     {% endfor %}
   </ul>
 </nav>
diff --git a/src/assets/stylesheets/base/_icons.scss b/src/assets/stylesheets/base/_icons.scss
@@ -46,3 +46,8 @@
     cursor: pointer;
   }
 }
+
+// Representational classes
+.md-icon {
+  @extend %md-icon;
+}
diff --git a/src/partials/nav-item.html b/src/partials/nav-item.html
@@ -42,13 +42,13 @@
         {{ nav_item.title}}
       </label>
       <ul class="md-nav__list" data-md-scrollfix>
+        {% set base = path %}
 
         <!-- Render nested item list -->
         {% for nav_item in nav_item.children %}
-          {% set temp = path %}
-          {% set path = path + "-" + loop.index | string %}
-          {% include "partials/nav-item.html" %}
-          {% set path = temp %}
+          {% with path = base + "-" + loop.index | string %}
+            {% include "partials/nav-item.html"  %}
+          {% endwith %}
         {% endfor %}
       </ul>
     </nav>

diff --git a/src/partials/nav.html b/src/partials/nav.html
@@ -39,8 +39,9 @@
   {% endif %}
   <ul class="md-nav__list" data-md-scrollfix>
     {% for nav_item in nav %}
-      {% set path = "nav-" + loop.index | string %}
-      {% include "partials/nav-item.html" %}
+      {% with path = "nav-" + loop.index | string %}
+        {% include "partials/nav-item.html" %}
+      {% endwith %}
     {% endfor %}
   </ul>
 </nav>