Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e134a15
Refactored all code smells listed in the found-issues section
aalokb Mar 19, 2019
9e2ce34
Restart Button in HTML
NikhilAnand1998 Mar 19, 2019
828d7b9
Update tetris.js
NikhilAnand1998 Mar 19, 2019
17a1a8e
Merge pull request #1 from CS362-TheCDC/CanvasJS_Code_Smells
aalokb Mar 19, 2019
a3ca829
Pause/Play Button JS
NikhilAnand1998 Mar 19, 2019
9bcd3c8
HTML changes for pause/play button
NikhilAnand1998 Mar 19, 2019
efd99b7
Images for File
NikhilAnand1998 Mar 19, 2019
29f6a1b
Update Information
kramerje Mar 19, 2019
296bb41
Merge pull request #2 from CS362-TheCDC/Pause/PlayButtons
NikhilAnand1998 Mar 19, 2019
3e83d5c
Update tetris.js
kramerje Mar 19, 2019
89568c0
Included error handling for Game Over Unit
aalokb Mar 19, 2019
e927d35
Update styles.css
kramerje Mar 19, 2019
e0b0687
Updated Tetris.js to have restart button functionality
NikhilAnand1998 Mar 19, 2019
cc6d007
Merge pull request #3 from CS362-TheCDC/Error_Handling_Game_Over
aalokb Mar 19, 2019
9ed8cca
HTML Changes for restart button
NikhilAnand1998 Mar 19, 2019
8e783c5
Merge branch 'master' into Restart_Button
NikhilAnand1998 Mar 19, 2019
05625b1
Merge pull request #4 from CS362-TheCDC/Restart_Button
NikhilAnand1998 Mar 19, 2019
f64407e
Merge branch 'master' into information_feature
kramerje Mar 19, 2019
3997178
Merge pull request #5 from CS362-TheCDC/information_feature
kramerje Mar 19, 2019
a6907e1
Add info image for button
kramerje Mar 19, 2019
216eca4
Merge pull request #7 from CS362-TheCDC/information_images
kramerje Mar 19, 2019
59a71b2
Updated Styles for it
NikhilAnand1998 Mar 19, 2019
e6de308
Update styles.css
kramerje Mar 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added PlayButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 86 additions & 2 deletions css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ body{
top:50%;
position: absolute;
background: #555;

}

#scene{
Expand Down Expand Up @@ -93,9 +93,93 @@ body{
font-weight: bold;
height:20px;
}
#restartInfo{
color:#fff;
font-weight: bold;
font-size: 18px;
}
#restart_button{
height: 50px;
width: 50px;
}
#pause_button{
height:50px;
width: 50px;
}
#play_button{
height: 50px;
width: 50px;
}

#info_button{
position: absolute;
height: 40px;
width: 40px;
bottom: 0;
right: 0;
}


#modal_backdrop{
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 1000;
background-color: rgba(0, 0, 0, 0.65);
}

#info_modal{
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 1010;
overflow: scroll;
}

.info_dialog{
width: auto;
max-width: 600px;
min-width: 350px;
min-height: 300px;
margin: 40px auto;
background-color: #fff;
border-radius: 15px;
}

.info_header{
position: relative;
padding: 10px 20px;
height: 20px;
}

.info_controls_header{
position: relative;
padding: 10px 20px;
}

.info_instructions_header{
position: relative;
padding: 10px 20px;
}

.info_close_button{
float: right;
border: none;
background: none;
cursor: pointer;
font-size: large;
padding: 10px;
position: relative;
z-index: 1000;
}

.hidden{
display: none;
}


.invisible{
Expand Down Expand Up @@ -138,4 +222,4 @@ body{
.fadeOutUp {
-webkit-animation-name: fadeOutUp;
animation-name: fadeOutUp;
}
}
Loading