Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,31 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Mario Bros</title>
<style>
html,
body {
width: 100%;
height: 100%;
background-color: #3ABBFC;
margin: 0;
}

.ground {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 75px;
background-image: url('https://i.smnarnold.com/exercices/git/test-a/grass.jpg');
background-size: 75px 75px;
}

.character {
position: absolute;
bottom: 75px;
left: 40%;
width: 198px;
height: 241px;
background-image: url('https://i.smnarnold.com/exercices/git/test-a/luigi.png');
background-image: url('https://i.smnarnold.com/exercices/git/test-a/mario-2.png');
background-size: 198px 241px;
}
</style>
Expand Down
20 changes: 19 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
Consignes: https://smnarnold.com/exercices/git/mario-bros
# Examen GIT

## Préambule
Effectuez un _Fork_ de ce répertoire.

## 1ère étape
Effectuez un _revert_ sur _index.html_ afin de retourner au commit précédent.

## 2e étape
_Mergez_ la branche _level_ dans la branche _master_.

## 3e étape
Créez une branche intitulée _Mario Bros 2_ à partir de la branche _master_.

## 4e étape
Sur la branche _Mario Bros 2_, remplacez l'image _mario.png_ par _mario-2.png_, ainsi que l'image _brick.jpg_ par _grass.jpg_. Commitez et poussez vos changements.

## Conclusion
Soumettez la branche _master_ de votre répertoire via un _Pull request_ au répertoire d'origine _smnarnold_.