Merge branch 'release/v1.1.0-rc2'

This commit is contained in:
CJ Patoilo 2016-01-08 10:51:51 -03:00
commit 5594f52080
5 changed files with 8 additions and 5 deletions

View File

@ -40,5 +40,11 @@
"src" "src"
], ],
"repo": "milligram/milligram", "repo": "milligram/milligram",
"styles": ["dist/milligram.css"] "styles": [
"demo",
"dist/milligram.css",
"dist/milligram.min.css",
"license",
"readme.md"
]
} }

View File

@ -19,7 +19,7 @@ module.exports = function ( grunt ) {
' * Milligram v<%= pkg.version %>\n'+ ' * Milligram v<%= pkg.version %>\n'+
' * <%= pkg.homepage %>\n'+ ' * <%= pkg.homepage %>\n'+
' *\n'+ ' *\n'+
' * Copyright (c) 2015, CJ Patoilo\n'+ ' * Copyright (c) '+new Date().getFullYear()+' CJ Patoilo\n'+
' * Licensed under the <%= pkg.license %> license\n'+ ' * Licensed under the <%= pkg.license %> license\n'+
'*/\n\n', '*/\n\n',

View File

@ -10,7 +10,6 @@ input[type='submit']
background-color: $color-primary background-color: $color-primary
border: .1rem solid $color-primary border: .1rem solid $color-primary
border-radius: .4rem border-radius: .4rem
box-sizing: border-box
color: $color-initial color: $color-initial
cursor: pointer cursor: pointer
display: inline-block display: inline-block

View File

@ -16,7 +16,6 @@ select
border: .1rem solid $color-quaternary border: .1rem solid $color-quaternary
border-radius: .4rem border-radius: .4rem
box-shadow: none box-shadow: none
box-sizing: border-box
height: 3.8rem height: 3.8rem
padding: .6rem 1.0rem // The .6rem vertically centers text on FF, ignored by Webkit padding: .6rem 1.0rem // The .6rem vertically centers text on FF, ignored by Webkit
width: 100% width: 100%

View File

@ -4,7 +4,6 @@
// .container is main centered wrapper with a max width of 1120rem (1120px) // .container is main centered wrapper with a max width of 1120rem (1120px)
.container .container
box-sizing: border-box
margin: 0 auto margin: 0 auto
max-width: 112.0rem max-width: 112.0rem
padding: 0 2.0rem padding: 0 2.0rem