Merge branch 'release/v1.2.0-rc4'

This commit is contained in:
CJ Patoilo 2016-08-04 00:23:43 -03:00
commit ad2c1f196b
7 changed files with 22 additions and 14 deletions

View File

@ -60,22 +60,22 @@ Milligram use [Sass](http://sass-lang.com/) to give super powers to CSS. Look at
.selector-b,
.selector-c,
.selector-d[type='text']
box-sizing: border-box
color: #333
content: ''
display: inline-block
font-family: 'Helvetica-Neue', 'Helvetica', 'Arial', sans-serif
box-sizing: border-box
color: #333
content: ''
display: inline-block
font-family: 'Helvetica-Neue', 'Helvetica', 'Arial', sans-serif
margin-bottom: 0
margin-left: 5.0rem
margin-left: 5.0rem
.other-selector-a
background: #fff
.other-selector-a
background: #fff
.other-selector-b
background: #fff
.other-selector-b
background: #fff
&.increasing-the-specificity
color: #000
&.increasing-the-specificity
color: #000
```
*Note: This style guide was inspired by [Idiomatic.css](https://github.com/necolas/idiomatic-css). Milligram uses an `.editorconfig` file, which most editors support, to enforce these coding standards.*

View File

@ -24,7 +24,7 @@ be fixed in the latest versions. -->
**Milligram:**
**Other (e.g. Normalize.css, Node.js, npm, bower, browser, operating system) (if applicable):**
**Other (e.g. normalize.css, node.js, npm, bower, browser, operating system) (if applicable):**
### Test case

View File

@ -3,6 +3,7 @@
.gitignore
.npmignore
.travis.yml
.versions
bower.json
changelog.md
component.json

View File

@ -33,6 +33,7 @@
".gitignore",
".npmignore",
".travis.yml",
".versions",
"bower.json",
"changelog.md",
"component.json",

View File

@ -33,6 +33,7 @@
".gitignore",
".npmignore",
".travis.yml",
".versions",
"bower.json",
"changelog.md",
"component.json",
@ -44,9 +45,11 @@
],
"repo": "milligram/milligram",
"styles": [
"demo",
"examples",
"dist/milligram.css",
"dist/milligram.css.map",
"dist/milligram.min.css",
"dist/milligram.min.css.map",
"license",
"readme.md"
]

View File

@ -29,9 +29,11 @@
],
"ignore": [
".editorconfig",
".github",
".gitignore",
".npmignore",
".travis.yml",
".versions",
"bower.json",
"changelog.md",
"component.json",

View File

@ -33,6 +33,7 @@
".gitignore",
".npmignore",
".travis.yml",
".versions",
"bower.json",
"changelog.md",
"component.json",