From 6708a7d26d3102414b154100b2c136d9b6492aeb Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Wed, 6 Jan 2016 02:18:47 -0300 Subject: [PATCH 1/4] added contributing file --- contributing.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 contributing.md diff --git a/contributing.md b/contributing.md new file mode 100644 index 0000000..a49ab86 --- /dev/null +++ b/contributing.md @@ -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 \ No newline at end of file From cfb3cc0563fd7efcb320c425741278ff6707fe7f Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Wed, 6 Jan 2016 03:36:37 -0300 Subject: [PATCH 2/4] added composer --- composer.json | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..2cb0217 --- /dev/null +++ b/composer.json @@ -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 ", + "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" + } +} \ No newline at end of file From 284caf64e108b8aa8743d407fb379f31ad7eb57c Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Wed, 6 Jan 2016 03:38:07 -0300 Subject: [PATCH 3/4] updated some informations and ignored files --- .npmignore | 3 +++ bower.json | 17 +++++++++-------- component.json | 17 +++++++++-------- gruntfile.js | 2 +- package.json | 15 ++++++++------- readme.md | 2 +- 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.npmignore b/.npmignore index 5573c1b..a4d89d7 100644 --- a/.npmignore +++ b/.npmignore @@ -3,5 +3,8 @@ .travis.yml bower.json component.json +composer.json +contributing.md gruntfile.js +package.js src \ No newline at end of file diff --git a/bower.json b/bower.json index 8cb7e45..e36c912 100644 --- a/bower.json +++ b/bower.json @@ -8,34 +8,35 @@ "author": "CJ Patoilo ", "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": { diff --git a/component.json b/component.json index b66f886..6cec394 100644 --- a/component.json +++ b/component.json @@ -8,34 +8,35 @@ "author": "CJ Patoilo ", "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", diff --git a/gruntfile.js b/gruntfile.js index ab55c41..aa4c4ad 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -58,7 +58,7 @@ module.exports = function ( grunt ) { all: [ 'dist' ] }, - // Compile SASS files to CSS + // Compile Sass files to CSS sass: { minify: { options: { diff --git a/package.json b/package.json index 9e43d36..b87f2cf 100644 --- a/package.json +++ b/package.json @@ -8,34 +8,35 @@ "author": "CJ Patoilo ", "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": { diff --git a/readme.md b/readme.md index 9c95539..b140111 100644 --- a/readme.md +++ b/readme.md @@ -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). From eaaef03d2870a3f72f1d146e0e11aebeb4bb44b4 Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Wed, 6 Jan 2016 03:38:50 -0300 Subject: [PATCH 4/4] improvement in code module --- src/_Code.sass | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/_Code.sass b/src/_Code.sass index 4903467..0b08e02 100644 --- a/src/_Code.sass +++ b/src/_Code.sass @@ -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