Merge branch 'release/v1.1.0-rc1'

This commit is contained in:
CJ Patoilo 2016-01-06 03:51:18 -03:00
commit b0b9aef1ec
10 changed files with 99 additions and 37 deletions

View File

@ -3,5 +3,8 @@
.travis.yml
bower.json
component.json
composer.json
contributing.md
gruntfile.js
package.js
src

View File

@ -8,34 +8,35 @@
"author": "CJ Patoilo <cjpatoilo@gmail.com>",
"main": "dist/milligram.css",
"keywords": [
"boilerplate",
"bootstrap",
"css",
"css3",
"design",
"front-end",
"framework",
"html",
"html5",
"kickstart",
"kickstarter",
"less",
"milligram",
"responsive",
"mobile",
"mobile-first",
"postcss",
"responsive",
"sass",
"stylus",
"style",
"stylesheet"
"scss",
"stylus"
],
"ignore": [
".editorconfig",
".gitignore",
".npmignore",
".travis.yml",
"component.json",
"package.json",
"composer.json",
"contributing.md",
"gruntfile.js",
"package.js",
"package.json",
"src"
],
"dependencies": {

View File

@ -8,34 +8,35 @@
"author": "CJ Patoilo <cjpatoilo@gmail.com>",
"main": "dist/milligram.css",
"keywords": [
"boilerplate",
"bootstrap",
"css",
"css3",
"design",
"front-end",
"framework",
"html",
"html5",
"kickstart",
"kickstarter",
"less",
"milligram",
"responsive",
"mobile",
"mobile-first",
"postcss",
"responsive",
"sass",
"stylus",
"style",
"stylesheet"
"scss",
"stylus"
],
"ignore": [
".editorconfig",
".gitignore",
".npmignore",
".travis.yml",
"bower.json",
"package.json",
"composer.json",
"contributing.md",
"gruntfile.js",
"package.js",
"package.json",
"src"
],
"repo": "milligram/milligram",

45
composer.json Normal file
View File

@ -0,0 +1,45 @@
{
"name": "milligram",
"version": "1.0.3",
"description": "A minimalist CSS framework.",
"homepage": "http://milligram.github.io",
"repository": "milligram/milligram",
"license": "MIT",
"author": "CJ Patoilo <cjpatoilo@gmail.com>",
"main": "dist/milligram.css",
"keywords": [
"bootstrap",
"css",
"css3",
"front-end",
"framework",
"html",
"html5",
"kickstarter",
"less",
"responsive",
"mobile",
"mobile-first",
"postcss",
"responsive",
"sass",
"scss",
"stylus"
],
"ignore": [
".editorconfig",
".gitignore",
".npmignore",
".travis.yml",
"bower.json",
"component.json",
"contributing.md",
"gruntfile.js",
"package.js",
"package.json",
"src"
],
"dependencies": {
"normalize.css": "latest"
}
}

10
contributing.md Normal file
View File

@ -0,0 +1,10 @@
## Contributing
Help improve these docs. Open an [issue](https://github.com/milligram/milligram/issues/new) or submit a pull request.
- Navigate to the main page of the repository
- [Fork it!](https://github.com/milligram/milligram#fork-destination-box)
- Create your feature branch: git checkout -b my-new-feature
- Commit your changes: git commit -m 'Add some feature'
- Push to the branch: git push origin my-new-feature
- Submit a pull request =D

View File

@ -58,7 +58,7 @@ module.exports = function ( grunt ) {
all: [ 'dist' ]
},
// Compile SASS files to CSS
// Compile Sass files to CSS
sass: {
minify: {
options: {

View File

@ -8,34 +8,35 @@
"author": "CJ Patoilo <cjpatoilo@gmail.com>",
"main": "dist/milligram.css",
"keywords": [
"boilerplate",
"bootstrap",
"css",
"css3",
"design",
"front-end",
"framework",
"html",
"html5",
"kickstart",
"kickstarter",
"less",
"milligram",
"responsive",
"mobile",
"mobile-first",
"postcss",
"responsive",
"sass",
"stylus",
"style",
"stylesheet"
"scss",
"stylus"
],
"ignore": [
".editorconfig",
".gitignore",
".npmignore",
".travis.yml",
"bower.json",
"component.json",
"composer.json",
"contributing.md",
"gruntfile.js",
"package.js",
"src"
],
"dependencies": {

View File

@ -60,4 +60,4 @@ Help improve these docs. Open an [issue](https://github.com/milligram/milligram/
## License
[MIT License](http://cjpatoilo.mit-license.org/) @ CJ Patoilo
Designed with ♥ by [CJ Patoilo](http://cjpatoilo.com). Licensed under the [MIT License](http://cjpatoilo.mit-license.org).

View File

@ -8,6 +8,7 @@ html
box-sizing: border-box
font-size: 62.5%
// Default body styles
body
color: $color-secondary
font-family: 'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif
@ -16,7 +17,7 @@ body
letter-spacing: .01em
line-height: 1.6
// Box Sizing FTW
// Set box-sizing globally to handle padding and border widths
*,
*:after,
*:before

View File

@ -2,11 +2,6 @@
// Code
//
pre
background: $color-tertiary
border-left: .3rem solid $color-primary
font-family: 'Menlo', 'Consolas', 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', monospace
code
background: $color-tertiary
border-radius: .4rem
@ -15,9 +10,14 @@ code
margin: 0 .2rem
white-space: nowrap
pre > code
background: transparent
border-radius: 0
display: block
padding: 1rem 1.5rem
white-space: pre
pre
background: $color-tertiary
border-left: .3rem solid $color-primary
font-family: 'Menlo', 'Consolas', 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', monospace
& > code
background: transparent
border-radius: 0
display: block
padding: 1rem 1.5rem
white-space: pre