Skip to content

#Desafio Setembro #4

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

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c12d44e
feat: project skeleton
jppradoleal Sep 10, 2019
350295e
feat: basic resources done
jppradoleal Sep 10, 2019
3e175bf
feat: expanded lcd screen
jppradoleal Sep 10, 2019
f519897
Merge pull request #1 from ImMurderer/extra-features
jppradoleal Sep 10, 2019
998a6f3
feat: from adicao to aritmetica done
jppradoleal Sep 12, 2019
ae72339
Merge pull request #2 from ImMurderer/extra-features
jppradoleal Sep 12, 2019
c86a8e3
feat: finished almost all games
jppradoleal Sep 13, 2019
e1de0e9
Merge pull request #3 from ImMurderer/extra-features
jppradoleal Sep 13, 2019
0c83ca1
feat: split-up main.js enhancement of yellow buttons
jppradoleal Sep 19, 2019
cd83e40
feat: started pokemon game ui, fixed colors, added piano sounds
jppradoleal Sep 20, 2019
ebc2dbe
Merge pull request #4 from ImMurderer/extra-features
jppradoleal Sep 20, 2019
b91cc98
feat: pokemon game done, little problem with lcd and emojis
jppradoleal Sep 20, 2019
7f4e52a
Merge pull request #5 from ImMurderer/extra-features
jppradoleal Sep 20, 2019
b94351a
feat: fixed lcd problems, and redestinated unused buttons
jppradoleal Sep 21, 2019
af69abe
Merge pull request #6 from ImMurderer/extra-features
jppradoleal Sep 21, 2019
d7936c7
Merge branch 'master' of https://github.com/CollabCodeTech/challenge-…
jppradoleal Sep 21, 2019
3832135
feat: readme made, favicon added, 666
jppradoleal Sep 21, 2019
dfb8bcf
feat: fixed contrast and responsivity, update in readme
jppradoleal Sep 22, 2019
940d1c7
Merge pull request #7 from ImMurderer/extra-features
jppradoleal Sep 22, 2019
00d7a64
feat: fixed a bug in arithmetic games
jppradoleal Sep 23, 2019
2cd89c2
Merge pull request #10 from ImMurderer/extra-features
jppradoleal Sep 23, 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
41 changes: 41 additions & 0 deletions 2019-setembro/immurderer/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
![Pense Bem](https://i.imgur.com/ldxhetL.png)

[![Netlify Status](https://api.netlify.com/api/v1/badges/3ad0b86f-d9b6-4608-8ecf-0e82bb0111c6/deploy-status)](https://immurderer-pense-bem.netlify.com)

## Pense Bem by ImMurderer

Minha ideia foi manter o layout original.
As cores foram adaptadas, visto que estavam muito saturadas, para a paleta foi usada uma [Flat Aussie](https://flatuicolors.com/palette/au).
Preferi não manter uma cor sólida ou degradê no fundo, então foi escolhido o pattern [Hodge Podge](http://thepatternlibrary.com/#hodgepodge).
O site está relativamente responsivo, há apenas alguns erros em questão de tamanho das linhas de botões. Há também um problema de saturação com os emojis no android, que ficam praticamente invisiveis nos botões grandes.

---

## Instruções

Ligue o aparelho, escolha um jogo. Pressione enter para responder as questões na tela! 😄

### Jogos

- Adição
- Use os botões numéricos para escolher o resultado da soma.
- Subtração
- Use os botões numéricos para escolher o resultado da subtração.
- Multiplicação

- Use os botões numéricos para escolher o resultado da multiplicação.

- Divisão
- Use os botões numéricos para escolher o resultado da divisão.
- Aritmética
- São apresentadas diversas contas aleatórias, use os botões numéricos para escolher o resultado.
- Operação
- São apresentadas diversas contas aleatórias sem o operador e seus resultados, utilize os botões azuis para escolher o operador correto que levará a resposta.
- Pokemón
- São apresentados diversos pokemóns, utilize os botões grandes para escolher o tipo certo do pokemón.
- ~~666~~
- RXN0ZSBqb2dvIGVzdMOhIGFtYWxkacOnb2FkbywgcG9yIGFsZ3VtIG1vdGl2byBlbGUgbsOjbyBtb3N0cmEgbmFkYSBhbMOpbSBkZSBjYXJhY3TDqXJlcyBhbGVhdG9yaW9zIGUgdW1hIG11c2ljYSBpbmZlcm5hbCEhIS4=
- Numero do Meio
- São apresentados 2 numeros insira, com os botões numéricos, a média destes numeros.
- Adivinhe o Numero
- O video-game gera um numero aleatório, use os botões numéricos para adivinhar.
Binary file added 2019-setembro/immurderer/css/fonts/DS-DIGI.TTF
Binary file not shown.
Binary file added 2019-setembro/immurderer/css/fonts/DS-DIGIB.TTF
Binary file not shown.
Binary file added 2019-setembro/immurderer/css/fonts/DS-DIGII.TTF
Binary file not shown.
Binary file added 2019-setembro/immurderer/css/fonts/DS-DIGIT.TTF
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
356 changes: 356 additions & 0 deletions 2019-setembro/immurderer/css/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,356 @@
@font-face {
font-family: DIGIT;
src: url("./fonts/DS-DIGI.TTF");
}

* {
padding: 0;
margin: 0;
box-sizing: content-box;
}
body {
background: url("./imgs/hodgepodge.png") lightblue;
}
#penseBem {
width: 70%;
margin: auto;
margin-top: 50px;
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
text-align: right;
padding-bottom: 5px;
}
/* #region front */
#front {
display: flex;
height: 150px;
align-items: center;
justify-content: center;
border-radius: 5px;
background-color: whitesmoke;
}

#front::before {
content: "";
position: relative;
left: 2%;
top: 82px;
background-color: white;
box-shadow: inset black;
width: 10%;
height: 20px;
box-shadow: inset 0 0 10px black;
z-index: -10;
}
#front::after {
content: "";
position: relative;
right: 2%;
top: 82px;
background-color: white;
box-shadow: inset black;
width: 10%;
height: 20px;
box-shadow: inset 0 0 10px black;
z-index: -10;
}

/* #endregion */

/* #region disk */
#disk {
width: 50%;
height: 112px;
display: flex;
justify-content: center;
align-items: center;
border: 5px inset;
border-radius: 0 5px 5px 0;
}

.cube {
position: absolute;
width: 75px;
height: 50px;
border: 5px inset;
border-radius: 5px;
}
.rect {
position: absolute;
background-color: white;
width: 200px;
height: 20px;
border: 5px inset;
border-radius: 5px;
}
/* #endregion */

/* #region lcd */
#display {
display: flex;
flex-direction: column;
width: 100%;
color: white;
overflow: hidden;
}

#lcd {
color: red;
font-size: 4em;
line-height: 83px;
background-color: #222;
border-radius: 5px 0 0 0;
padding: 5px 15px;
font-family: DIGIT, sans-serif, serif;
height: 83px;
}

#lcd-footer {
display: flex;
background-color: #333;
padding: 5px 15px;
justify-content: space-between;
align-items: center;
border-radius: 0 0 0 5px;
}

#lcd-footer div {
display: flex;
}

.brick {
width: 50px;
height: 10px;
margin-left: 5px;
}
/* #endregion */

/* #region keys */
#keyboard {
padding: 15px 15px;
margin-top: 15px;
background-color: whitesmoke;
border-radius: 5px;
}

#keys {
background-color: #ccc;
padding: 5px 15px;
display: flex;
flex-direction: column;
border: 5px inset;
}

#keys .line {
display: flex;
flex-wrap: wrap;
margin-bottom: 15px;
justify-content: space-between;
width: 95%;
align-items: center;
}

#keys > :first-child > :first-child {
margin-top: 15px;
align-self: flex-start;
}
#keys > :nth-child(2) > :first-child {
align-self: flex-end;
}
#keys > :last-child > :first-child {
font-size: 0.6em;
align-self: flex-start;
}
/* #endregion */

ul {
list-style-type: none;
}

/* #region buttons */
.btn,
.btn-lg {
display: flex;
background-color: white;
color: black;
align-content: space-between;
justify-content: center;
flex-direction: column;
text-align: center;
width: 65px;
height: 65px;
word-wrap: break-word;
border-radius: 5px;
box-shadow: inset 0 0 10px black;
color: blue;
font-weight: bold;
}
.btn:hover,
.btn-lg:hover {
box-shadow: none;
cursor: pointer;
}
.btn-lg {
width: 100px;
height: 145px;
font-size: 28px;
}
.btn span {
height: 50%;
line-height: 200%;
border-radius: 5px;
}
/* #endregion */

/* #region rhomboid */
.rhomboid {
transform: skew(-15deg);
margin-left: 5px;
}

.rhomboid-btn-group {
display: flex;
margin-left: 15px;
}

/* #endregion */

/* #region double-stacked */
.double-stacked {
display: grid;
grid-template-columns: 1fr;
grid-template-rows: 1fr 1fr;
grid-row-gap: 15px;
grid-column-gap: 5px;
margin-left: 15px;
width: 300px;
}

.double-stacked .first-line,
.last-line {
display: flex;
}
.double-stacked .first-line {
justify-self: flex-end;
}
.double-stacked .last-line {
justify-self: flex-start;
}
.double-stacked .btn {
margin-right: 5px;
}
/* #endregion */

#logo {
height: 25px;
font-size: 1.5em;
background-color: antiquewhite;
padding: 0 50px;
border: 1px solid lightgray;
border-radius: 5px;
}

.marquee {
white-space: nowrap;
background-color: #222;
overflow: hidden;
}
.marquee > span {
padding-left: 100%;
animation: marquee 15s linear infinite;
}

@keyframes marquee {
0% {
transform: translate(60%, 0);
}
100% {
transform: translate(-100%, 0);
}
}

@media screen and (max-width: 770px) {
#front {
position: relative;
}
#front #disk {
display: none;
}
#display {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
#penseBem {
width: 100%;
margin-top: 0;
}
#front {
border-radius: 0;
}

#keyboard {
border-radius: 0px;
}
.double-stacked {
padding-top: 15px;
}
.btn,
.btn-lg {
max-width: 64px;
max-height: 64px;
font-size: 12px;
}
.btn-lg {
max-width: 64px;
max-height: 64px;
}
}
@media screen and (min-width: 1500px) {
.btn,
.btn-lg {
width: 82px;
height: 82px;
font-size: 16px;
}
.btn-lg {
width: 142px;
height: 142px;
font-size: 32px;
}
.btn > span {
line-height: 250%;
}
}

/* #region colors */
.pink {
background-color: #be2edd;
}
.yellow {
background-color: #f9ca24;
color: #324e08;
}
.blue {
background-color: #4834d4;
}
.green {
background-color: #6ab04c;
color: #1e1e1e;
}
.red {
background-color: #eb4d4b;
color: #1e0c0c;
font-weight: bold;
}

.pink,
.blue,
.green,
.red {
color: white;
font-weight: bold;
}

/* #endregion */
Binary file added 2019-setembro/immurderer/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading