diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 968baa9334c8909d20bf4884d82c72bd46a6c67e..5a8c8cef1ea628702cee4dabfc87ee4d089ebb36 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,2 +1,33 @@ -## Contributing -Changes and improvements are more than welcome! Feel free to fork and open a pull request. Please make your changes in a specifically made branch and request to pull on `master`! If you can, please make sure the game fully works before sending the PR, as that will help speed up the process. +# Contributing +Changes and improvements are more than welcome! Feel free to fork and open a pull request. + +Please follow the house rules to have a bigger chance of your contribution being merged. + +## House rules + +### How to make changes + - To make changes, create a new branch based on `master` (do not create one from `gh-pages` unless strictly necessary) and make them there, then create a Pull Request to master. + `gh-pages` is different from master in that it contains sharing features, analytics and other things that have no direct bearing with the game. `master` is the "pure" version of the game. + - If you want to modify the CSS, please edit the SCSS files present in `style/`: `main.scss` and others. Don't edit the `main.css`, because it's supposed to be generated. + In order to compile your SCSS modifications, you need to use the `sass` gem (install it by running `gem install sass` once Ruby is installed). + To run SASS, simply use the following command: + `sass --watch style/main.scss` + SASS will automatically recompile your css when changed. + - `Rakefile` contains some tasks that help during development. Feel free to add useful tasks if needed. + - Please use 2-space indentation when editing the JavaScript. A `.jshintrc` file is present, which will help your code to follow the guidelines if you install and run `jshint`. + - Please test your modification thouroughly before submitting your Pull Request. + +### Changes that might not be accepted +We have to be conservative with the core game. This means that some modifications won't be merged, or will have to be evaluated carefully before being merged: + + - Undo/redo features + - Save/reload features + - Changes to how the tiles look or their contents + - Changes to the layout + - Changes to the grid size + +### Changes that are welcome + - Bug fixes + - Compatibility improvements + - "Under the hood" enhancements + - Small changes that don't have an impact on the core gameplay diff --git a/README.md b/README.md index 19c6d0e011ecbbf40127c745354554645736a910..dac8af33f569331015a3d356eeb070818825c94b 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Made just for fun. [Play it here!](http://gabrielecirulli.github.io/2048/) - [TimPetricola](https://github.com/TimPetricola) added best score storage - [chrisprice](https://github.com/chrisprice) added custom code for swipe handling on mobile - [elektryk](https://github.com/elektryk) made swipes work on Windows Phone + - [mgarciaisaia](https://github.com/mgarciaisaia) addes support for Android 2.3 Many thanks to [rayhaanj](https://github.com/rayhaanj), [Mechazawa](https://github.com/Mechazawa), [grant](https://github.com/grant), [remram44](https://github.com/remram44) and [ghoullier](https://github.com/ghoullier) for the many other good contributions. diff --git a/style/main.css b/style/main.css index 5d10c6f22ab99a27f9726d5c0f5380a7ca99e85d..d6b7ce01263815b3009331c9c55c5989e9046b91 100644 --- a/style/main.css +++ b/style/main.css @@ -143,14 +143,15 @@ hr { padding: 15px; cursor: default; -webkit-touch-callout: none; + -ms-touch-callout: none; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; + -ms-touch-action: none; background: #bbada0; border-radius: 6px; width: 500px; height: 500px; - -ms-touch-action: none; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } @@ -554,14 +555,15 @@ hr { padding: 10px; cursor: default; -webkit-touch-callout: none; + -ms-touch-callout: none; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; + -ms-touch-action: none; background: #bbada0; border-radius: 6px; width: 280px; height: 280px; - -ms-touch-action: none; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } diff --git a/style/main.scss b/style/main.scss index 4403621beead441e7e6bab5ee0e2e03b388c902c..84e9021d641bc8c25bb3b21e4ace0fa5fad57d7b 100644 --- a/style/main.scss +++ b/style/main.scss @@ -176,15 +176,18 @@ hr { cursor: default; -webkit-touch-callout: none; + -ms-touch-callout: none; + -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; + -ms-touch-action: none; + background: $game-container-background; border-radius: $tile-border-radius * 2; width: $field-width; height: $field-width; - -ms-touch-action: none; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box;