From a2f0b07369f620f69cdbaa08fc556983688a3970 Mon Sep 17 00:00:00 2001 From: Jeremy Thomas Date: Sun, 16 Oct 2016 19:15:56 +0100 Subject: [PATCH] Fix imports --- .gitignore | 1 + CHANGELOG.md | 4 + bulma.sass | 11 +- docs/.gitignore | 3 +- docs/_config.yml | 1 - docs/_includes/blog-hero.html | 4 +- docs/_includes/footer.html | 8 +- docs/_includes/head.html | 6 +- docs/_includes/header.html | 12 +- docs/_includes/subnav-components.html | 20 +- docs/_includes/subnav-elements.html | 22 +- docs/_includes/subnav-grid.html | 4 +- docs/_includes/subnav-layout.html | 8 +- docs/_includes/subnav-modifiers.html | 6 +- docs/_includes/subnav-overview.html | 10 +- docs/_layouts/documentation.html | 10 +- docs/_layouts/post.html | 2 +- docs/bulma-docs.sass | 3 +- docs/css/bulma-docs.css | 1592 +---- docs/css/bulma.css | 5887 ----------------- docs/css/utilities.css | 175 - docs/css/variables.css | 0 docs/documentation/components/level.html | 4 +- docs/documentation/components/nav.html | 4 +- docs/documentation/layout/hero.html | 6 +- docs/documentation/navbar.html | 4 +- docs/documentation/overview/classes.html | 2 +- docs/documentation/overview/modular.html | 5 +- docs/index.html | 20 +- docs/templates.html | 6 +- docs/thank-you.html | 2 +- sass/base/{base.sass => _all.sass} | 0 sass/base/generic.sass | 3 - sass/base/helpers.sass | 2 - .../components/{components.sass => _all.sass} | 0 sass/components/card.sass | 2 - sass/components/level.sass | 3 - sass/components/media.sass | 3 - sass/components/menu.sass | 2 - sass/components/message.sass | 3 - sass/components/modal.sass | 3 - sass/components/nav.sass | 3 - sass/components/pagination.sass | 3 - sass/components/panel.sass | 3 - sass/components/tabs.sass | 3 - sass/elements/{elements.sass => _all.sass} | 0 sass/elements/box.sass | 2 - sass/elements/button.sass | 3 - sass/elements/content.sass | 2 - sass/elements/form.sass | 5 +- sass/elements/image.sass | 2 - sass/elements/notification.sass | 3 - sass/elements/other.sass | 3 - sass/elements/progress.sass | 2 - sass/elements/table.sass | 3 - sass/elements/title.sass | 3 - sass/grid/{grid.sass => _all.sass} | 0 sass/grid/columns.sass | 3 - sass/grid/tiles.sass | 3 - sass/layout/{layout.sass => _all.sass} | 0 sass/layout/footer.sass | 2 - sass/layout/hero.sass | 3 - sass/layout/section.sass | 3 - sass/utilities/_all.sass | 6 + sass/utilities/animations.sass | 5 - sass/utilities/controls.sass | 3 - sass/utilities/mixins.sass | 11 +- sass/utilities/variables.sass | 2 - 68 files changed, 417 insertions(+), 7527 deletions(-) delete mode 100644 docs/css/bulma.css delete mode 100644 docs/css/utilities.css delete mode 100644 docs/css/variables.css rename sass/base/{base.sass => _all.sass} (100%) rename sass/components/{components.sass => _all.sass} (100%) rename sass/elements/{elements.sass => _all.sass} (100%) rename sass/grid/{grid.sass => _all.sass} (100%) rename sass/layout/{layout.sass => _all.sass} (100%) create mode 100644 sass/utilities/_all.sass delete mode 100644 sass/utilities/animations.sass diff --git a/.gitignore b/.gitignore index b9721477..430cf609 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 17e7b656..b9720506 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 bfe4defd..ee167c6e 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 b30ca048..9099b667 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 6c887ec7..bf38e5da 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 454ddd5b..b1a5e499 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 090eeeba..1e905667 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -120,12 +120,12 @@ - - - + + + {% if page.route == 'index' %} - + {% endif %}