Ark/bulma
1
0
Fork 0
mirror of https://github.com/jgthms/bulma synced 2026-03-21 20:54:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/rem

Browse Source
This commit is contained in:
Jeremy Thomas
2017-01-04 18:41:30 +01:00
parent 126e8b7532 44b1ccfe19
commit 1301b4594c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@@ -4,7 +4,7 @@ Thanks for helping out! 😇
* Pull the latest `master` branch * Pull the latest `master` branch
* Run `npm install` to install all Bulma dependencies * Run `npm install` to install all Bulma dependencies
* Make sure your Sass code is compliant with the [Bulma Sass styleguide](https://github.com/jgthms/bulma/blob/master/CONTRIBUTING.md#bulma-sass-styleguide) * Make sure your Sass code is compliant with the [Bulma Sass styleguide](https://github.com/jgthms/bulma/blob/master/.github/CONTRIBUTING.md#bulma-sass-styleguide)
* If your PR fixes an issue, reference that issue * If your PR fixes an issue, reference that issue
* If your PR has lots of commits, **rebase** first * If your PR has lots of commits, **rebase** first
* Run `npm run build` and `npm run docs` before submitting your PR * Run `npm run build` and `npm run docs` before submitting your PR

2
docs/documentation/overview/modular.html
View File

@@ -25,7 +25,7 @@ doc-subtab: modular
Simply <strong>import</strong> the utilities dependencies, and then the files you need directly: Simply <strong>import</strong> the utilities dependencies, and then the files you need directly:
</p> </p>
{% highlight sass %} {% highlight sass %}
@import "bulma/sass/utilities/_all @import "bulma/sass/utilities/_all"
@import "bulma/sass/grid/columns" @import "bulma/sass/grid/columns"
{% endhighlight %} {% endhighlight %}
<p> <p>