Skip to content

Commit

Permalink
Merge branch 'release/v1.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeroen Ooms committed Nov 27, 2016
2 parents ad026a9 + 81fbb9f commit bc8efc1
Show file tree
Hide file tree
Showing 9 changed files with 632 additions and 602 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ dist/demo
node_modules
*.sass-cache
.publish
.DS_Store
.DS_Store
.idea
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v1.3.2

* Fix validation issues for .optional-prop mixin in Less version.

## v1.3.1

* Update files in dist folder
Expand Down Expand Up @@ -34,4 +38,4 @@

## v1.0.0

* Add IE10 to "dinosaur mode" and set it to "false" by default
* Add IE10 to "dinosaur mode" and set it to "false" by default
17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,27 @@ with browserify:

## Configure

Overwrite default values for generic typography:
### Overwrite default values for generic typography
```
$initialize-box-sizing: border-box;
$initialize-font-family: sans-serif;
$initialize-font-size: 1em;
$initialize-line-height: 1.4;
```

Microsoft [dropped support](https://www.microsoft.com/en-us/WindowsForBusiness/End-of-IE-support) for IE8, IE9 & IE10. If you still have to support these old dinosaur browsers, just set dinosaur mode to true.
### Options

```
$initialize-print-styles: true;
$initialize-html5-boilerplate-overwrites: true;
```

Microsoft [dropped support](https://www.microsoft.com/en-us/WindowsForBusiness/End-of-IE-support) for IE8, IE9 & IE10. If you still have to support these old dinosaur browsers, just set dinosaur mode to true. This option is set to false by default.
```
$initialize-dinosaur-mode: true;
```

Optional values:
### Optional values
```
$initialize-color: #000;
$initialize-block-margins: 0 0 0.75em;
Expand All @@ -51,7 +58,3 @@ $initialize-heading-color: #000;
$initialize-heading-font-family: sans-serif;
$initialize-heading-margins: 1em 0 0.75em;
```

```
$initialize-print-styles: true;
```
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "initialize-css",
"version": "1.3.1",
"version": "1.3.2",
"homepage": "http://jeroenoomsnl.github.io/initialize-css/",
"authors": [
"Jeroen Ooms (@jeroenooms)"
Expand Down
Loading

0 comments on commit bc8efc1

Please sign in to comment.