Skip to content
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

Cagnotte #1

Open
wants to merge 83 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
8e802fb
Fichier à jour
Tenessy May 10, 2021
bfff683
Fichier à jour
Tenessy May 10, 2021
3252ed0
Ajout fichier petit écrans
Tenessy May 12, 2021
81f8f37
Fichier à jour 14/05/2021
Tenessy May 14, 2021
878de59
Responsive petit écran
Tenessy May 14, 2021
1c412e5
Css reservia à jour
Tenessy May 14, 2021
2c02cda
reservia à jour
Tenessy May 14, 2021
ea5c320
Fichier à jour
Tenessy May 16, 2021
c12a4c8
Fichier css à jour
Tenessy May 16, 2021
9b8649c
Ajout tablette.css
Tenessy May 16, 2021
eb7dba9
Fichier tablette à jour
Tenessy May 16, 2021
f81c410
Fichier à jour
Tenessy May 16, 2021
3f8245e
Fichier css à jour
Tenessy May 16, 2021
5e62167
Fichier tablette à jour
Tenessy May 16, 2021
71848df
Fichier à jour
Tenessy May 17, 2021
e94c083
Fichier html à jour
Tenessy May 17, 2021
df68ecd
Tablette à jour
Tenessy May 17, 2021
37005dd
Fichier mis à jour le 20/05/2021
Tenessy May 20, 2021
1272af9
Tablette à jour le 20/05/2021
Tenessy May 20, 2021
0df6b90
Smartphone à jour
Tenessy May 20, 2021
77046d1
Reservia à jour
Tenessy May 20, 2021
10eb7b8
Nouveau css
Tenessy May 20, 2021
b2617c2
Nouveau css 320px
Tenessy May 21, 2021
2d909a6
petitediag à jour
Tenessy May 21, 2021
0e0a19b
petitEcran à jour
Tenessy May 21, 2021
f038268
tablette à jour
Tenessy May 21, 2021
1aeabd5
reservia à jour
Tenessy May 21, 2021
b91564b
html à jour
Tenessy May 21, 2021
cbccb2b
desktop à jour
Tenessy May 21, 2021
1adfc44
Grand ecran à jour
Tenessy May 21, 2021
6b242af
desktop.ccs terminé
Tenessy May 21, 2021
f0be5a4
tablette.css terminé
Tenessy May 21, 2021
e229f7f
grandEcran.css terminé
Tenessy May 21, 2021
9d9715e
reservia.css terminé
Tenessy May 21, 2021
e286119
reservia.html terminé
Tenessy May 21, 2021
11294e8
reservia.html terminé
Tenessy May 21, 2021
73bed54
Set theme jekyll-theme-cayman
Tenessy May 21, 2021
6e10791
Create README.md
Tenessy May 21, 2021
1dbfde4
Rename README.md to index.html
Tenessy May 21, 2021
ecc1384
4small
Tenessy May 21, 2021
13fb8bb
logo
Tenessy May 21, 2021
d839a08
1xlarge
Tenessy May 21, 2021
d45f776
png
Tenessy May 22, 2021
8c01a4d
Merge branch 'cagnotte' of https://github.com/Tenessy/Projet2Openclas…
Tenessy May 22, 2021
c5b6db9
activites
Tenessy May 22, 2021
d71a0d4
desktop à jour
Tenessy May 22, 2021
f256dfa
reservia à jour
Tenessy May 22, 2021
5ee9e85
reservia
Tenessy May 22, 2021
a3db49c
reservia
Tenessy May 22, 2021
42cca23
reservia
Tenessy May 22, 2021
37e6571
reservia
Tenessy May 22, 2021
3b41d44
reservia
Tenessy May 22, 2021
72d6911
reservia
Tenessy May 22, 2021
662c3ed
fichier
Tenessy May 22, 2021
501069d
reservia
Tenessy May 22, 2021
967fb5c
large
Tenessy May 22, 2021
b0efb52
petitecran
Tenessy May 22, 2021
3a07da8
reservia
Tenessy May 22, 2021
ee6b82c
reservia css
Tenessy May 22, 2021
3ac85be
Update index.html
Tenessy May 22, 2021
79a35d0
grandecran
Tenessy May 22, 2021
8702301
reservia à jour
Tenessy May 22, 2021
18b0283
Merge branch 'cagnotte' of https://github.com/Tenessy/Projet2Openclas…
Tenessy May 22, 2021
c21ddc4
desktop
Tenessy May 22, 2021
cd26fbb
reservia css
Tenessy May 22, 2021
48b2575
petit ecran
Tenessy May 22, 2021
926a0bd
petite diag
Tenessy May 22, 2021
e1d25a0
petitecran
Tenessy May 23, 2021
f6ac62a
petitediagonale
Tenessy May 23, 2021
013ddd0
tablette
Tenessy May 23, 2021
03cf6e7
desktop
Tenessy May 23, 2021
f13f7b3
tablette
Tenessy May 23, 2021
57dca5a
petit ecran
Tenessy May 23, 2021
87b5c7b
petitediag
Tenessy May 23, 2021
59d2649
reservia
Tenessy May 23, 2021
a5af416
reservia css
Tenessy May 23, 2021
ce2d3fe
grandecran
Tenessy May 23, 2021
59fc049
reservia à jour
Tenessy May 23, 2021
8662db3
Update index.html
Tenessy May 23, 2021
34c3cbc
Update index.html
Tenessy May 23, 2021
8812764
Update index.html
Tenessy May 23, 2021
9abae1d
Update reservia.html
Tenessy May 23, 2021
9f5eb2a
Update reservia.html
Tenessy May 23, 2021
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 1_xlarge/aminaXlarge.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 added 1_xlarge/annie-spratt-Eg1qcIitAuA-unsplash.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 added 1_xlarge/aw-creative-VGs8z60yT2c-unsplash.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 added 1_xlarge/emile-guillemot-Bj_rcSC5XfE-unsplash.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 added 1_xlarge/febrian-zakaria-sjvU0THccQA-unsplash.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 added 1_xlarge/hotelduportLarge.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 added 1_xlarge/marcus-loke-WQJvWU_HZFo-unsplash.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 added 1_xlarge/nicate-lee-kT-ZyaiwBe0-unsplash.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 added 1_xlarge/reisetopia-B8WIgxA_PFU-unsplash.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 added 2_large/AuCoeurLarge.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 added 2_large/HotelToutbleuLarge.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 added 2_large/aminaLarge.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 added 2_large/aubergecannabiereLarge.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 added 2_large/aubergelepanierLarge.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 added 2_large/hotelSoleilLarge.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 added 2_large/hoteldelamerLarge.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 added 2_large/hotelduportLarge.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 added 2_large/hotellesmouettesLarge.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 added 4_small/Amina.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 added 4_small/AuCoeurDhotes.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 added 4_small/LaMer.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 added 4_small/SoleilDuMatin.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 added 4_small/ToutBleu.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 added 4_small/fred-kleber-gTbaxaVLvsg-unsplash.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 added 4_small/marcus-loke-WQJvWU_HZFo-unsplash.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 added 4_small/nicate-lee-kT-ZyaiwBe0-unsplash.jpg
Binary file added 4_small/reisetopia-B8WIgxA_PFU-unsplash.jpg
Binary file added Projet 2 - Reservia-3/Desktop - 1.png
Binary file added Projet 2 - Reservia-3/iPhone 8 - 1.png
3 changes: 3 additions & 0 deletions Reservia.svg

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-cayman
Binary file added activites/2_large/fortPromegueLarge.jpg
Binary file added activites/2_large/vieuxportLarge.jpg
Binary file added activites/3_medium/NotreDameMedium.jpg
Binary file added activites/3_medium/ParcCalanqueMedium.jpg
Binary file added activites/3_medium/ParcLongchampMedium.jpg
Binary file added activites/3_medium/fortPromegueMedium.jpg
Binary file added activites/3_medium/iledufrioulMedium.jpg
Binary file added activites/4_small/fortPromegueSmall.jpg
Binary file added activites/4_small/iledefrioulSmall.jpg
249 changes: 249 additions & 0 deletions desktop.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,249 @@
@media screen and (min-width:1024px) and (max-width: 1440px) {

#menu {

display: flex;
flex-direction: column;
margin-left: 30px;
width: auto;
flex-wrap: wrap;
align-items: center;
}

#menu {
align-items: center;

}

#menu h1 {
margin-left: -430px;
margin-top: 0;
}
#menu h2 {
margin-left: -760px;
margin-top: 0;
}

#menu #recherche {
margin-left: -580px;
}

#menu h3 {
margin-left: -90px;

}

#menu h5 {

margin-left: -600px;
}

#menu .info {

margin-left: -990px;
}

#menu nav h4:first-child {
margin-left: -90px;
}

header img {

margin-left: 30px;
}
header {

display: flex;
width: auto;
flex-direction: row;
justify-content: center;
flex-wrap: nowrap;
font-size: 24px;
font-weight: normal;
margin-top: -30px;
margin-left: 155px;
}

header nav {
margin-left: 550px;
margin-top: 50px;
position: absolute;
}

header img {
position: absolute;
margin-left: -1050px;
}
header .bordbleu {
margin-left: 240px;
margin-top: 10px;
}

header {

width: auto;
flex-wrap: wrap;
margin-top: -10px;
position: relative;

}

#filtre {

display: flex;
flex-wrap: wrap;
width: auto;
margin-left: -60px;
margin-top: -70px;
}

#filtre li {

margin-top: 15px;
margin-left: 15px;

}

.heberge {

display: flex;
flex-direction: row;
flex-wrap: wrap;
margin-left: 90px;
padding-top: 60px;
padding-bottom: 20px;
width: 590px;
height: 725px;
}

.hotel {

width: 245px;
height: 195px;
box-shadow: 0px 5px 15px 0px #F2F2F2;
border-radius: 15px/15px;
margin-top: 25px;
}

.hotel i {
margin-top: 10px;
}


.heberge h2 {

position:absolute;
margin-left: 35px;
margin-top: -20px;
font-size: 20px;

}
.heberge h5 {

top: 700px;
margin-left: 35px;
margin-top: 0;

}
#alignement {

display: flex;
flex-direction: row;
justify-content: center;

}

#populaire {
width: 365px;
margin-left: 20px;
height: 805px;
}

#populaire .hotel2 {

width: 310px;
height: 195px;
margin-left: 25px;
margin-top: 30px;
}

#populaire img {


height: 185px;
}

#populaire .fa-chart-line{

margin-left: 320px;

}

#populaire .hotel2 h3 {

margin-top: -160px;
}

#populaire .istar{

margin-top: 55px;
margin-left: 150px;

}

#populaire h2 {

margin-left: 25px;
}
#conteneur {

display: flex;
flex-direction: row;
flex-wrap: wrap;
margin-left: -30px;
margin-top: -20px;
justify-content: center;
width: 100%;
}

.alignement3 {
display: flex;
justify-content: center;
flex-direction: row;

}

#three h2 {

margin-left: -780px;
font-size: 20px;
margin-top: 50px;
}

#conteneur .hotel3, #conteneur .hotel4, #conteneur .hotel5, #conteneur .hotel6, #conteneur .hotel7 {

width: 290px;
height: 190px;
margin-top: 35px;
margin-left: 50px;
}

#conteneur img {

width: 290px;
height: 140px;
}


#basdepage {
width: auto;
flex-direction: row;
margin-left: auto;
justify-content: center;
flex-wrap: wrap;
}

#basdepage .apropos {
margin-left: 10px;
}
}
108 changes: 108 additions & 0 deletions grandEcran.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
@media screen and (min-width: 1440px) {

#menu {
align-items: center;

}

#menu h1 {
margin-left: -810px;
margin-top: 0;
}
#menu h2 {
margin-left: -1140px;
margin-top: 0;
}

#menu #recherche {
margin-left: -980px;
}

#menu h5:last-child {
margin-left: -1000px;

}
#populaire .istar {

margin-left: 155px;
margin-top: 25px;

}

#menu .info {

margin-left: -1390px;
}

#menu nav h3 {
margin-left: -20px;
font-size: 18px;
}

#filtre li {
margin-left: 25px;
}

header {

display: flex;
width: auto;
flex-direction: row;
justify-content: center;
flex-wrap: nowrap;
font-size: 24px;
font-weight: normal;
margin-top: -30px;
margin-left: 155px;

}

header {

width: auto;
flex-wrap: wrap;
margin-top: 0;
position: relative;

}
header nav {
margin-left: 850px;
margin-top: 50px;
position: absolute;
}



header img {
position: absolute;
margin-left: -1350px;
}

header .bordbleu {
margin-top: 0;
margin-left: 530px;
}
#conteneur {
margin-left: -10px;
}

#three h3:first-child {
margin-left: -1130px;
}

#basdepage {

width: auto;
flex-direction: row;
margin-left: auto;
justify-content: center;
flex-wrap: wrap;
}

#basdepage .apropos {

margin-left: -390px;
}


}
Loading