Skip to content
This repository was archived by the owner on Dec 11, 2020. It is now read-only.

Commit

Permalink
Merge pull request #110 from aleexnl/pre
Browse files Browse the repository at this point in the history
update production
  • Loading branch information
jcsalinas20 authored Nov 11, 2020
2 parents dcef4dd + d40e24d commit 543b2a7
Show file tree
Hide file tree
Showing 42 changed files with 1,272 additions and 315 deletions.
Binary file added Documentation/Normal_vision_vs_Deuteranopia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions Documentation/Retrospective.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Retrospective
## Sprint 1
Fallos en la implementación de la metodologia SCRUM (mover cosas a done sin estar en producción). Además nos falló la parte de testear correctamente los desarrollos.

El trabajo en equipo ha sido adecuado y no ha habido ningun contratiempo importante; todos los componentes del grupo han asumido correctamente todas sus responsabilidades en el momento.
## Sprint 2
No prestamos la suficiente atención a las espeficiaciones, llevandonos a fallar una.

El trabajo en equipo ha sido adecuado y no ha habido ningun contratiempo importante; todos los componentes del grupo han asumido correctamente todas sus responsabilidades en el momento.
## Sprint 3
Binary file modified Documentation/color-palette.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/wireframes/game.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/wireframes/landing-page.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/wireframes/result.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions css/game.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,23 @@ tbody tr td button {
.container {
text-align: center;
}

.container h1 {
font-size: 80px;
font-weight: bold;
font-family: AmongUsFont;
text-align: center;
margin: 1rem 0 0 0;
}

#btn-start,
#btn-resolve {
font-size: 1.5rem;
padding: 0.5rem 2rem;
margin: 1rem 0;
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.6);
}

#btn-start,
#btn-resolve:hover {
cursor: pointer;
Expand All @@ -54,6 +57,16 @@ tbody tr td button {

#BarContent {
text-align: -webkit-center;
text-align: -moz-center;
}

.countdown {
font-size: 25px;
font-weight: bold;
}

.color-red {
color: red;
}

#Bar {
Expand All @@ -69,9 +82,20 @@ tbody tr td button {
background-color: #2e9cca;
width: 0%;
}

/*** 800X600 ***/
@media (max-width: 800px) {
tbody tr td button {
height: 70px;
width: 70px;
}
}

/*** 375X667 ***/
@media (max-width: 375px) {

#btn-start,
#btn-resolve {
padding: 0.5rem 1rem;
}
}
20 changes: 8 additions & 12 deletions css/gameover.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ body {
padding: 0;
}

h1 {
font-size: 1em;
}

p#title {
font-size: 8em;
font-weight: bold;
Expand All @@ -17,7 +21,7 @@ p#title {
width: 100%;
font-family: AmongUsFont;
animation: 1.25s both titleEffect;
margin-top: 1em;
margin: 1em 0;
}

div.box {
Expand All @@ -26,7 +30,8 @@ div.box {
box-shadow: 0 0 65px 75px #821f0b;
margin: auto;
border: 0px #0000;
margin-top: 35px;
margin-top: 10em;
margin-bottom: 7em;
border-radius: 29px;
display: flex;
flex-flow: row wrap;
Expand Down Expand Up @@ -64,10 +69,7 @@ form#form-save {
}

footer {
position: fixed;
bottom: 0;
left: 0;
right: 0;
position: relative;
}

p.level-code {
Expand All @@ -86,7 +88,6 @@ p.level-code {
}
}


/*** 1366x768 ***/
@media (max-width: 1366px) {}

Expand All @@ -104,12 +105,7 @@ p.level-code {
margin: 5% 0 1em 0;
}

footer {
position: relative;
}

div.box {
margin-bottom: 7em;
box-shadow: 0 0 50px 58px #821f0b;
}

Expand Down
14 changes: 12 additions & 2 deletions css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ form {
align-content: center;
text-align: center;
padding: 1%;
margin: 0;
margin: 0 0 2em 0;
}

.form-option {
width: 100%;
}

h1 {
Expand All @@ -37,6 +41,7 @@ h1 {
}

form button {
margin: auto;
font-size: 1.5rem;
padding: 0.5rem 2rem;
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.6);
Expand All @@ -48,11 +53,16 @@ form button:hover {

form input {
margin: -0.5rem 0 1rem 0;
padding: 1rem;
padding: 0.5rem;
font-size: 1.25rem;
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.6);
}

.input-code-lvl {
width: 150px;
text-align: center;
}

/*** 1366x768 ***/
@media (max-width: 1366px) {
h1 {
Expand Down
107 changes: 73 additions & 34 deletions css/ranking.css
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
/*html, body {
height: 100%;
}*/

header {
position: fixed !important;
}

body {
background-color: #1b1b1b;
display: flex;
flex-flow: row wrap;
margin-bottom: 3em;
}

div.container-ranking {
margin: 60px auto 0 auto;
}

h1.title {
color: white;
font-size: 80px;
color: #fff;
font-size: 5.5em;
font-weight: bold;
font-family: AmongUsFont;
text-align: center;
width: 100%;
margin: 4% 0 1% 0;
}

.ranking-box {
width: 50%;
}

h2.subtitle {
color: white;
font-size: 4em;
font-weight: bold;
font-family: AmongUsFont;
text-align: center;
margin: 1% 0;
}

table {
Expand All @@ -47,28 +52,6 @@ tr:nth-child(even) {
background-color: #1e3344;
}

/* box-shadow: 0 0 3px 1px black;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
tbody {
box-shadow: 0 0 3px 1px black;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
tr {
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
tr.first-table-cell,
tr.first-table-cell td {
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}*/

thead tr td p {
padding: 0 20px;
}
Expand All @@ -79,6 +62,7 @@ p.width-username {

p.width-points {
width: 200px;
margin: auto;
}

.table-title {
Expand All @@ -87,12 +71,67 @@ p.width-points {
text-align: center;
}

div.image-box {
width: 20%;
margin: auto;
text-align: center;
}

div.image-box img {
height: 40px;
}

.username {
padding-left: 20px;
width: 80%;
font-size: 17px;
}

.points {
text-align: center;
font-size: 17px;
}

@media (max-width: 1400px) {
p.width-username {
width: 10em;
}

p.width-points {
width: 5em;
}
}


@media (max-width: 1050px) {
p.width-username {
width: 7em;
}

p.width-points {
width: 3em;
}
}

@media (max-width: 800px) {
table {
width: 100%;
table-layout: fixed;
overflow-wrap: break-word;
}

.ranking-box {
width: 90%;
margin: auto;
}

.survival {
margin-top: 0.5em !important;
}
}

@media (max-width: 400px) {

h1.title {
font-size: 4.5em;
}
}
Loading

0 comments on commit 543b2a7

Please sign in to comment.