Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

My new feature #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ __Steps to Follow__

1. Fork it!
2. Create your feature branch: `git checkout -b my-new-feature`
3. Commit your changes: `git commit -am 'Add some feature'`
3. Commit your changes`
4. Push to the branch: `git push origin my-new-feature`
5. Submit a pull request

Expand Down
15 changes: 8 additions & 7 deletions css/styles.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
body{
background: #333;
padding-top: 2%;
background: #999;
font-family: verdana;
overflow:hidden;
}

.wrapper{
.wrapper{padding-top: 7%;
width: 100%;
max-width: 1200px;
margin: auto;
Expand Down Expand Up @@ -50,7 +51,7 @@ body{
}

.panels div.front:hover{
outline: 3px solid #00b8ff;
outline: 4px solid #00b8ff;
}

.match div.front{
Expand All @@ -64,21 +65,21 @@ body{
}

.mismatch div.front{
outline: 3px dashed red;
outline: 4px dashed red;
}

.mismatch div.back{
outline: 3px dashed red;
outline: 4px dashed red;
animation: twirl 0.2s 0.2s ease-out forwards reverse;
}

.activated div.front{
outline: 3px solid white;
outline: 4px solid white;
animation: twirl 0.2s ease-in forwards;
}

.activated div.back{
outline: 3px solid white;
outline: 4px solid white;
animation: twirl 0.2s 0.2s ease-out forwards reverse;
}

Expand Down
2 changes: 1 addition & 1 deletion js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ unblock = function(){

checkWin = function(){
if(tiles == 40){
alert("You won in " + (new Date().getTime() - time) / 1000 + " seconds! click OK to restart");
alert("You WON in " + (new Date().getTime() - time) / 1000 + " seconds! click OK to Restart");
location.reload();
}
}
Expand Down