From 6ef2ccd0ea8c59b0297027de7399fe8eb4502e65 Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Sun, 31 Jan 2016 00:46:05 -0300 Subject: [PATCH 1/4] improvement contributing --- contributing.md | 107 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 79 insertions(+), 28 deletions(-) diff --git a/contributing.md b/contributing.md index b8c7d3b..673ea4b 100644 --- a/contributing.md +++ b/contributing.md @@ -1,39 +1,90 @@ -## Getting Started +# Contributing -1. Install dependencies +We would love for you to contribute to Milligram and help us make this even better! Start reading this document to see it is not difficult as you might have imagined. - * Git () - * Grunt () - * Node.js () - * NPM () - * Sass () -1. Clone repository +## Table of Contents - ```bash - $ git clone git@github.com:milligram/milligram.git - $ cd milligram - ``` +- [Open an Issue](#open-an-issue) +- [Submit a Pull Request](#submit-a-pull-request) +- [Building](#building) +- [Style Guide](#style-guide) +- [Code of Conduct](#code-of-conduct) +- [License](#license) -1. Install node dependencies using npm - ```bash - $ npm install - ``` +## Open an Issue -1. Run +[Open an Issue](https://github.com/milligram/milligram/issues/new) to report any problems or improvements. When necessary, use [Codepen](http://codepen.io/) to show the problem. Be sure to include some description to explain the problem. - ```bash - $ npm start - ``` -## Contributing +## Submit a Pull Request -Help improve these docs. Open an [issue](https://github.com/milligram/milligram/issues/new) or submit a pull request. +To submit a new feature, make sure that changes are done to the source code. [Follow our style guide](#style-guide) and do not forget the tests and attach the link [Codepen](http://codepen.io/) along with the description. -- 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 +Try to solve a problem for each pull request, this increases the chances of acceptance. When in doubt, open a [new issue](#open-an-issue) so we can answer you. Look existing issues for ideas or to see if a similar issue has already been submitted. + +1. Fork the Github repo: `git clone https://github.com/milligram/milligram.git` +1. Create a new branch: `git checkout -b issuenumber-feature-name` +1. Commit your changes: `git commit -m 'issuenumber-feature-name'` +1. Push to the branch: `git push origin my-feature-name` +1. Submit a pull request! + +*Note: For issues relating to the site, please use the [milligram.github.io](https://github.com/milligram/milligram.github.io)* + + +## Building + +First install [Node.js](https://nodejs.org/en/download/), em seguida [Grunt](http://gruntjs.com/getting-started) e [Sass](http://sass-lang.com/install) for the build process. Now install all the dependencies, run `npm install` from the project directory. Once you have the dependencies installed, run `grunt`. This will run the default grunt task which compiles the Sass files into milligram.css file. + + +## Style Guide + +Milligram use [Sass](http://sass-lang.com/) to give super powers to CSS. Look at how the code is being maintained, we must always be consistent. We try to follow best practices as much as possible. In addition, here are some tips you should follow: + +- Properties and selectors are sorted in alphabetical order +- Always use tab to indentation, no spaces +- Always use single quote, i.e. `content: ''` +- Quote attribute values in selectors, i.e. `input[type='checkbox']` +- Avoid specifying units for zero-values, i.e. `margin: 0` +- Use `rem` unit instead of `px` +- Use lowercase and shorthand hex values, i.e. `#fff` +- Use one discrete selector per line in multi-selector rulesets +- Include a single space after colon and after each comma +- Separate each ruleset by a blank line +- Don't use prefixes, there is a task to generate this automatically + +```sass +.selector-a, +.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 + margin-bottom: 0 + margin-left: 5.0rem + + .other-selector-a + background: #fff + + .other-selector-b + background: #fff + + &.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.* + + +## Code of conduct + +Help us keep Milligram open and inclusive. Please read and follow our thoughts on [Code of Conduct](http://confcodeofconduct.com/). + + +## License + +By contributing your code, you agree to license your contribution under the [MIT license](https://github.com/milligram/milligram#license). From 8004bd7390f7fe72ebbd3da1a562b57a29ca0200 Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Sun, 31 Jan 2016 00:49:21 -0300 Subject: [PATCH 2/4] name change and fixing the problem with the element `hr` --- src/{_Misc.sass => _Divider.sass} | 4 ++-- src/milligram.sass | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/{_Misc.sass => _Divider.sass} (90%) diff --git a/src/_Misc.sass b/src/_Divider.sass similarity index 90% rename from src/_Misc.sass rename to src/_Divider.sass index d83eb45..e230a71 100644 --- a/src/_Misc.sass +++ b/src/_Divider.sass @@ -1,9 +1,9 @@ -// Misc +// Divider // –––––––––––––––––––––––––––––––––––––––––––––––––– hr + border: 0 border-top: .1rem solid $color-tertiary - border-width: 0 margin-bottom: 3.5rem margin-top: 3rem diff --git a/src/milligram.sass b/src/milligram.sass index d5ca697..d52035b 100644 --- a/src/milligram.sass +++ b/src/milligram.sass @@ -7,11 +7,11 @@ @import Blockquote @import Button @import Code +@import Divider @import Form @import Grid @import Link @import List -@import Misc @import Spacing @import Table @import Typography From 2e03ebffa657700f6b143a73fabe9ad1958e53a0 Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Sun, 31 Jan 2016 03:28:58 -0300 Subject: [PATCH 3/4] updated informations --- bower.json | 1 + component.json | 1 + composer.json | 1 + demo/index.html | 12 +----------- license | 2 +- package.json | 1 + readme.md | 11 ++--------- src/_Button.sass | 2 ++ 8 files changed, 10 insertions(+), 21 deletions(-) diff --git a/bower.json b/bower.json index e360d7e..44dd9cb 100644 --- a/bower.json +++ b/bower.json @@ -11,6 +11,7 @@ "bootstrap", "css", "css3", + "flexbox", "front-end", "framework", "html", diff --git a/component.json b/component.json index 9286f21..992e4bb 100644 --- a/component.json +++ b/component.json @@ -11,6 +11,7 @@ "bootstrap", "css", "css3", + "flexbox", "front-end", "framework", "html", diff --git a/composer.json b/composer.json index 29273c4..ae443cd 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "bootstrap", "css", "css3", + "flexbox", "front-end", "framework", "html", diff --git a/demo/index.html b/demo/index.html index 7740612..5ee57a1 100644 --- a/demo/index.html +++ b/demo/index.html @@ -116,17 +116,7 @@
Contributing
-

Help improve these docs. Open an issue or submit a pull request.

-

-

    -
  1. Navigate to the main page of the repository
    2. -
  2. Fork it!
    3. -
  3. Create your feature branch: git checkout -b my-new-feature
    4. -
  4. Commit your changes: git commit -m 'Add some feature'
    5. -
  5. Push to the branch: git push origin my-new-feature
    6. -
  6. Submit a pull request =D
    7. -
-

+

Want to contribute? Follow these recommendations.