Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	README.md
	bower.json
	bulma.sass
	docs/.gitignore
	docs/_config.yml
	docs/_includes/head.html
	docs/_includes/navbar.html
	docs/_sass/example.sass
	docs/_sass/highlight.sass
	docs/_sass/specific.sass
	docs/css/bulma-docs.css
	docs/css/bulma-docs.css.map
	docs/documentation/columns/responsiveness.html
	docs/documentation/columns/sizes.html
	docs/documentation/components/card.html
	docs/documentation/components/message.html
	docs/documentation/components/navbar.html
	docs/documentation/elements/icon.html
	docs/documentation/form/input.html
	docs/documentation/form/textarea.html
	docs/documentation/layout/footer.html
	docs/documentation/modifiers/typography-helpers.html
	docs/versions.html
	package.json
	sass/elements/form.sass
	sass/elements/other.sass
  • Loading branch information...
intenscia committed Sep 20, 2017
2 parents dedce30 + 4bf7bd0 commit 9ef0034aca51a80d87a7e48fd9a0623e2fc78d77
@@ -11,3 +11,4 @@ npm-debug.log
_gh_pages
_site
node_modules
test/output/
@@ -478,4 +478,4 @@ Variable name changes (mostly appending `-color`):

### Removed

* **helpers** `.is-inline` and `.is-block`
* **helpers** `.is-inline` and `.is-block`

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 9ef0034

Please sign in to comment.