Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Update index.html #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update index.html #4

wants to merge 1 commit into from

Conversation

AugustoPerboni
Copy link

No description provided.

@@ -18,6 +18,7 @@
<div class="displaytext"><span>0</span></div>
<div class="buttonbox">
<button class="row-4 col-3 non-digit" data-sym="=">=</button>
<button class="row-2 col-1 non-digit" data-sym="4">=</button>
Copy link
Contributor

@madskaddie madskaddie Mar 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

O 4 é um dígito e portanto não deve ter a classe non-digit

Copy link
Contributor

@madskaddie madskaddie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tens de actualizar este código com a versão mais actual.

Para isso, no teu terminal:

git fetch -a
git merge orgin/master

isto vai gerar conflitos
para resolver conflitos editas o ficheiro manualmente. Podes tambem investigar o uso do comando:

git mergetool

depois de estar tudo ok:

git commit
git push origin AusgustoPerboni

de forma a ficarem todos os botões que estavam mais o teu: o 0, o 7, o = e o teu 4

Podes sempre abrir o ficheiro index.html no browser para ver o resultado

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants