From d403f84d7de6ab91782e47157fb7cfbcb3b296ce Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Sun, 23 Mar 2014 19:56:08 +0100 Subject: [PATCH 1/4] add https://github.com/mgarciaisaia mention to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 19c6d0e..dac8af3 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. From 7dcbe282844bd44c3ce18f32f58a026c0a6d7dd4 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Sun, 23 Mar 2014 20:09:19 +0100 Subject: [PATCH 2/4] #98 improve contributing guide --- CONTRIBUTING.md | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 968baa9..876e7a7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,2 +1,32 @@ ## 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. +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 in regards to the core game. This means that some modifications won't be merged, or will have to be evaluated carefully before doing 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 From 71baa9d3d708a3cac419fa2df59af0ec78ede312 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Sun, 23 Mar 2014 20:12:53 +0100 Subject: [PATCH 3/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 876e7a7..5a8c8ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,23 +1,24 @@ -## Contributing +# 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 +## House rules -#### How to make changes +### 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: + 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 in regards to the core game. This means that some modifications won't be merged, or will have to be evaluated carefully before doing being merged: +### 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 @@ -25,7 +26,7 @@ We have to be conservative in regards to the core game. This means that some mod - Changes to the layout - Changes to the grid size -#### Changes that are welcome +### Changes that are welcome - Bug fixes - Compatibility improvements - "Under the hood" enhancements From b08fa8d6a48efbf7018bc1812f3de2c7d550877c Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Sun, 23 Mar 2014 20:17:22 +0100 Subject: [PATCH 4/4] apply css improvements from #68 --- style/main.css | 6 ++++-- style/main.scss | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/style/main.css b/style/main.css index fca9c2e..ac50bc7 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; } @@ -543,14 +544,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 946d415..29478c4 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;