From: Jeremy Thomas Date: Sun, 16 Oct 2016 18:15:56 +0000 (+0100) Subject: Fix imports X-Git-Tag: 0.3.0~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aed21e7fb35a306e4b3bbc087f9498156d672d09;p=thirdparty%2Fbulma.git Fix imports --- diff --git a/.gitignore b/.gitignore index b97214777..430cf609a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Files .DS_Store .ruby-version +test.sass npm-debug.log # Folders diff --git a/CHANGELOG.md b/CHANGELOG.md index 17e7b6560..b9720506f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Bulma Changelog +## 0.2.2 + +* Fix: remove multiple imports + ## 0.2.1 * Fix: container flex diff --git a/bulma.sass b/bulma.sass index bfe4defdc..ee167c6e0 100644 --- a/bulma.sass +++ b/bulma.sass @@ -1,7 +1,8 @@ @charset "utf-8" -@import "sass/base/base.sass" -@import "sass/elements/elements.sass" -@import "sass/components/components.sass" -@import "sass/grid/grid.sass" -@import "sass/layout/layout.sass" +@import "sass/utilities/_all" +@import "sass/base/_all" +@import "sass/elements/_all" +@import "sass/components/_all" +@import "sass/grid/_all" +@import "sass/layout/_all" diff --git a/docs/.gitignore b/docs/.gitignore index b30ca048b..9099b6679 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,9 +1,10 @@ # Files .DS_Store +.jekyll-metadata _config.local.yml -css/bulma-test.css bulma-test.sass bulma-website-local.sass +css/bulma-test.css npm-debug.log # Folders diff --git a/docs/_config.yml b/docs/_config.yml index 6c887ec74..bf38e5da0 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -11,7 +11,6 @@ url: http://bulma.io # Variables -baseurl: "" documentation: "/documentation/overview/start/" download: https://github.com/jgthms/bulma/archive/0.2.1.zip github: https://github.com/jgthms/bulma diff --git a/docs/_includes/blog-hero.html b/docs/_includes/blog-hero.html index 454ddd5b9..b1a5e4994 100644 --- a/docs/_includes/blog-hero.html +++ b/docs/_includes/blog-hero.html @@ -10,12 +10,12 @@

- Blog + Blog

Stay updated about new features, bug fixes, and releases

- + diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 090eeebad..1e9056674 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -120,12 +120,12 @@ - - - + + + {% if page.route == 'index' %} - + {% endif %}