diff --git a/.stylelintrc b/.stylelintrc index 93125f695..2a2cb7f83 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -180,7 +180,6 @@ "z-index" ], "property-no-vendor-prefix": true, - "root-no-standard-properties": true, "selector-class-pattern": "^[a-z0-9]+(-[a-z0-9]+)*(__[a-z]+)?(--[a-z]+)?$", "selector-descendant-combinator-no-non-space": null, "string-quotes": "double", diff --git a/.travis.yml b/.travis.yml index c0e8785d5..a3229c15f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,9 +23,9 @@ sudo: false # Node.js versions node_js: - - 4 - 5 - 6 + - 7 # Install a C++11 compatible compiler addons: @@ -47,6 +47,7 @@ git: # Cache dependencies cache: pip: true + yarn: true directories: - node_modules @@ -55,4 +56,4 @@ before_script: - pip install --user -r requirements.txt # Perform build and tests -script: npm run build +script: yarn run build diff --git a/material/base.html b/material/base.html index 85821a9d9..665256718 100644 --- a/material/base.html +++ b/material/base.html @@ -110,7 +110,7 @@ edit {% endif %} {% block content %} - {% if not "\x3ch1 id=" in page.content %} + {% if not "\x3ch1" in page.content %}

{{ page.title | default(config.site_name, true)}}

{% endif %} {{ page.content }} diff --git a/material/partials/nav-item.html b/material/partials/nav-item.html index 651c60120..be77f2f6b 100644 --- a/material/partials/nav-item.html +++ b/material/partials/nav-item.html @@ -25,10 +25,10 @@
  • {% set toc_ = page.toc %} - {% if "\x3ch1 id=" in page.content %} + {% if toc_ | first is defined %} {% set toc_ = (toc_ | first).children %} {% endif %} - {% if toc_ and (toc_ | first) %} + {% if toc_ | first is defined %} @@ -36,7 +36,7 @@ {{ nav_item.title }} - {% if page.toc %} + {% if toc_ | first is defined %} {% include "partials/toc.html" %} {% endif %}
    • diff --git a/material/partials/toc.html b/material/partials/toc.html index 004067dda..5e44226b1 100644 --- a/material/partials/toc.html +++ b/material/partials/toc.html @@ -1,10 +1,10 @@ {% import "partials/language.html" as lang %}