diff options
| author | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
| commit | 265fda7903e189ee0d2d7201cc92bf384fc53043 (patch) | |
| tree | cf2249e0696d6ea2923678f9f7b155e265756f03 /CONTRIBUTING.md | |
| parent | a46003b8c7cc20bf4f72b7638a74643353ae047f (diff) | |
| parent | 727a91de1cdf5cbc4f25528e073480332a5940c5 (diff) | |
| download | bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.tar.xz bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.zip | |
Merge branch 'master' into restore_grid_mixins
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2cbd6e32c..fcd95bf7a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,7 +36,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ### CSS -- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/) +- Adhere to the [RECESS CSS property order](http://markdotto.com/2011/11/29/css-property-order/) - Multiple-line approach (one property and value per line) - Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`) - End all lines with a semi-colon |