Skip to content
Snippets Groups Projects
Commit deff14a9 authored by Baptiste's avatar Baptiste
Browse files

Mise à jour du Readme et de la page Web

parent cde85c89
No related branches found
No related tags found
No related merge requests found
......@@ -7,5 +7,6 @@ Margot Noyelle, Lucie Soanen, Baptiste Vallet
https://docs.google.com/spreadsheets/d/14a3eB31QkthkGVVAecEcV6-Z9DthQwR8UL2eY9XBZnQ/edit?usp=sharing
## Page web du projet :
https://perso.isima.fr/~lusoanen
https://perso.isima.fr/~bavallet
/* ----------------------------- */
/* ==reset */
/* ----------------------------- */
/* base font-size corresponds to 10px and is adapted to rem unit */
html {
font-size: 62.5%;
}
body {
background-color: #fff;
color: #000;
font-family: "Century Gothic", helvetica, arial, sans-serif;
font-size: 1.4em; /* equiv 14px */
line-height: 1.5; /* adapt to your design */
}
/* font-sizing for content */
/* preserve vertical-rythm, thanks to http://soqr.fr/vertical-rhythm/ */
p,
ul,
ol,
dl,
blockquote,
pre,
td,
th,
label,
textarea,
caption,
details,
figure,
hgroup {
font-size: 1em; /* equiv 14px */
line-height: 1.5;
margin: 1.5em 0 0;
}
h1, .h1-like {
font-size: 1.8571em; /* equiv 26px */
font-weight: normal;
line-height: 1.6154em;
margin: .8077em 0 0 0;
}
h2, .h2-like {
font-size: 1.7143em; /* equiv 24px */
font-weight: normal;
line-height: 1.75em;
margin: .875em 0 0 0;
}
h3, .h3-like {
font-size: 1.5714em; /* equiv 22px */
font-weight: normal;
line-height: 1.909em;
margin: .9545em 0 0 0;
}
h4, .h4-like {
font-size: 1.4286em; /* equiv 20px */
font-weight: normal;
line-height: 1.05em;
margin: 1.05em 0 0 0;
}
h5, .h5-like {
font-size: 1.2857em; /* equiv 18px */
font-weight: normal;
line-height: 1.1667em;
margin: 1.1667em 0 0 0;
}
h6, .h6-like {
font-size: 1.1429em; /* equiv 16px */
font-weight: normal;
line-height: 1.3125em;
margin: 1.3125em 0 0 0;
}
/* alternate font-sizing */
.smaller {
font-size: .7143em; /* equiv 10px */
line-height: 2.1em;
}
.small {
font-size: .8571em; /* equiv 12px */
line-height: 1.75em;
}
.big {
font-size: 1.1429em; /* equiv 16px */
line-height: 1.3125em;
}
.bigger {
font-size: 1.2857em; /* equiv 18px */
line-height: 1.1667em;
}
.biggest {
font-size: 1.4286em; /* equiv 20px */
line-height: 1.05em;
}
/* soft reset */
html,
body,
textarea,
figure,
label {
margin: 0;
padding: 0;
}
ul,
ol {
padding-left: 2em;
}
code,
pre,
samp {
white-space: pre-wrap;
font-family: consolas, 'DejaVu Sans Mono', courier, monospace;
}
code { line-height: 1em; }
table { margin-bottom: 1.5em; }
/* avoid top margins on first content element */
p:first-child,
ul:first-child,
ol:first-child,
dl:first-child,
blockquote:first-child,
pre:first-child,
h1:first-child,
h2:first-child,
h3:first-child,
h4:first-child,
h5:first-child,
h6:first-child {
margin-top: 0;
}
/* avoid margins on nested elements */
li p,
li ul,
li ol {
margin-top: 0;
margin-bottom: 0;
}
/* HTML5 tags */
article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
display: block;
}
/* max values */
img, table, td, blockquote, code, pre, textarea, input, video {
max-width: 100%;
}
/* you shall not pass */
div, textarea, table, td, th, code, pre, samp {
word-wrap: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
-o-hyphens: auto;
hyphens: auto;
}
/* pictures */
img {
width: auto;
height: auto;
vertical-align: middle;
}
a img { border: 0; }
/* scripts */
body > script {display: none !important;}
/* skip-links */
.skip-links {
position: absolute;
}
.skip-links a {
position: absolute;
left: -9999px;
padding: 0.5em;
background: #000;
color:#fff;
text-decoration: none;
}
.skip-links a:focus {
position: static;
}
header, footer, nav, aside {
background: #2D4650;
color: #FFFFFF;
border-style: solid;
border-width: 0.3vh;
border-color: black;
}
body {
display:block flex;
flex-flow: column nowrap;
position: absolute;
min-height: 80vh;
width: 100vw;
overflow-x: hidden;
}
header {
display: block;
height: 6vh;
min-width: 75vw;
max-width: 80vw;
border-left: none;
border-right: none;
padding-left: 20vw;
z-index: 2;
}
footer {
display: block;
height: 10vh;
min-width: 80vw;
max-width: 85vw;
/*width: 85vw;*/
border-left: none;
border-right: none;
padding-left: 15vw;
padding-bottom: 1vh;
z-index: 2;
}
footer.register {
position: absolute;
bottom: 0%;
}
main {
display: block;
padding: 7vh 17vw 7vh 15vw;
background: #FEFCF5;
min-height: 69vh;
min-width: 50vw;
max-width: 75vw;
}
main.register {
min-height: 54.1vh;
padding: 7vh 15vw 21vh 15vw;
}
main.main-page {
max-width: 100vw;
overflow-x: hidden;
}
main.chat {
display:block flex;
flex-flow: column nowrap;
}
nav {
border-top: none;
border-left: none;
position: absolute;
left: 0;
z-index: 1;
display: block flex;
float: left;
flex-flow: column wrap;
justify-content: flex-start;
align-items: stretch;
margin: 0;
padding: 7vh 0.25vw 0vh 0.25vw;
width: 12vw;
min-height: 90vh;
height: 91%;
font-size: 0.9em;
}
#nav-Nerwende {
height: 93%;
}
nav > ul{
display: block flex;
flex-flow: column nowrap;
}
form {
display: block;
padding: 10px;
width: 100%;
}
aside{
position: absolute;
right: 0;
top: 0;
z-index: 1;
float: right;
border-right: none;
margin: 0;
padding: 7vh 0.5vw 1vh 0.5vw;
font-size: 1em;
height: 91%;
width: 14vw;
}
a {
transition: all 0.5s ease-in-out;
}
a:link {
color: #B6CFD9;
text-decoration: none;
}
a:visited {
color: #B6CFD9;
text-decoration: none;
}
a:hover {
border-width: 5px;
border-color: #2D4650;
border-radius: 5px;
background: #B6CFD9;
text-decoration: underline;
color: black;
padding: 5px;
}
a:active {
color: #CD65D9;
}
.img-perso {
width: 180px;
border-radius: 10px;
border-style: solid;
border-width: 5px;
border-color: black;
}
.character-name {
font-family: 'Lovers Quarrel', cursive;
font-size: 2em;
}
input:focus {
border-color: rgba(82, 168, 236, 0.75);
box-shadow: 0 0 8px rgba(82, 168, 236, 0.5);
}
.correct {
border-color: rgba(68, 191, 68, 0.75);
}
.correct:focus {
border-color: rgba(68, 191, 68, 0.75);
box-shadow: 0 0 8px rgba(68, 191, 68, 0.5);
}
.incorrect {
border-color: rgba(191, 68, 68, 0.75);
}
.incorrect:focus {
border-color: rgba(191, 68, 68, 0.75);
box-shadow: 0 0 8px rgba(191, 68, 68, 0.5);
}
.help {
display: inline-block;
color: rgb(200, 0, 0);
margin-left: 20px;
padding: 2px 4px;
border: 1px solid #000;
background-color: #CCC;
border-radius: 4px;
}
#msg {
font-size: 1.5em;
padding: 0px 6px 0px 6px;
border-radius: 6px;
}
.button {
border-radius: 4px;
color: #3E5964;
background: white;
margin: 0vh 0.25vw 1vh 0vw;
}
.button:hover {
box-shadow: 0 0 5px #E6C1F5;
background: #E6C1F5;
}
textarea {
transition: all 0.3s ease-in-out;
}
textarea:focus {
border-color: #2D4650;
}
.msg-box {
max-width: 55vw;
border-radius: 5px;
padding: 1px 5px 1px 5px;
box-shadow: 0 0 3px #EFE0F5;
background: #EFE0F5;
color: #2D4650;
}
div#conversation {
display: none;
padding: 1vh 1vw 1vh 1vw;
margin: 1vh 1vw 1vh 1vw;
width: 66.5vw;
max-height: 50vh;
overflow-y: scroll;
}
#conversation-form {
display: none;
padding: 0vh 1vw 0vh 1vw;
}
#conversation-form > p {
margin-top: 0.5vh;
}
.msg-sent {
display: none;
padding: 2vh 25vw 2vh 25vw;
color: #0B436B;
}
.msg-error {
display: block;
padding: 1vh 25vw 1vh 25vw;
color: #0B436B;
font-size: 1.2em;
}
.msg-txt {
font-size: 2.5vh;
}
.name {
font-size: 2vh;
opacity: 0.9;
}
.time {
font-size: 1.75vh;
opacity: 0.65;
}
#inscription-inactive {
display: block;
}
#inscription-form {
display: none;
}
#connexion-form {
display: none;
}
#connexion {
display: none;
}
@media screen and (max-width: 900px) {
header, footer, nav, aside {
border-style: solid;
border-width: 5px;
border-color: black;
border-right: none;
border-left: none;
}
body {
min-width: 100vw;
max-width: 100vw;
font-size: 95%;
}
header {
min-width: 75vw;
max-width: 95vw;
padding: 10px 5px 5px 5px;
}
footer {
height: 60px;
min-width: 75vw;
max-width: 95vw;
padding: 10px 5px 10px 5px;
}
main {
min-width: 75vw;
max-width: 100vw;
display: block;
padding: 2vh 2vw 2vh 2vw;
overflow-x: hidden;
}
main.main-page {
max-width: 100vw;
overflow-x: hidden;
}
aside {
margin: 1vh 1vw 1vh 1vw;
position: static;
max-width: 100vw;
width: auto;
height: auto;
padding: 0.5em;
border-style: solid;
border-width: 5px;
border-color: black;
}
nav {
position: static;
flex-flow: row nowrap;
justify-content: space-around;
align-items: stretch;
width: 95vw;
min-height: 5vh;
max-height: 10vh;
border-bottom: none;
padding: 10px 5px 10px 5px;
font-size: 90%;
}
div#conversation {
width: 90vw;
}
.msg-box {
max-width: 85vw;
}
#conversation-form {
max-width: 90vw;
}
#msg {
width: 90vw;
}
}
\ No newline at end of file
<!DOCTYPE html>
<html lang="fr">
<head>
<!-- En-tête de la page-->
<meta charset="utf-8" />
<title> Labyrinthe </title>
<link rel="stylesheet" href="Style/style.css">
<!-- <base href="pageType.html" /> --> <!--Vide pour le moment-->
</head>
<body>
<header>
<!--En tête-->
<h1>Projet de Labyrinthe</h1>
<a href="main.html">Page d'acceuil</a>
<a href="https://gitlab.isima.fr/lusoanen/projet_zz1_g1">GitLab</a>
</header>
<section>
<h2> Jour 1 </h2>
<h3> Margot NOYELLE</h3>
<article>
<p>
Jeu de la vie
</p>
</article>
<h3> Lucie SOANEN</h3>
<article>
<p>
Rendu
</p>
</article>
<h3> Baptiste VALLET</h3>
<article>
<p>
Animations en fenêtre
</p>
</article>
</section>
</body>
<head>
<!-- <meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta http-equiv="content-language" content="fr" />
Ces deux lignes sont là pour la compatibilité avec les vieux navigateurs mais le validateur du w3c génère des erreurs sur ces lignes. -->
<meta charset="utf-8" />
<meta name="viewport" content="witdth=device-width, initial-scale=1.0"/>
<meta name="author" content="Margot Noyelle, Lucie Soanen, Baptiste VALLET"/>
<meta name="keywords" content="tp"/>
<meta name="description" content="Projet ZZ1"/>
<link rel="stylesheet" type="text/css" media="all" href="Style/base.css" />
<link rel="stylesheet" type="text/css" media="all" href="Style/style2.css" />
<link href="https://fonts.googleapis.com/css2?family=Lovers+Quarrel&display=swap" rel="stylesheet" type="text/css">
<title>Labyrinthe</title>
</head>
<body class="main-page">
<header>
<h1>Projet de Labyrinthe</h1>
</header>
<main class="main-page">
<section>
<h2>Lundi 14 Juin</h2>
<h3>Margot Noyelle</h3>
<p>
Début du Jeu de la vie.
</p>
<h3>Lucie Soanen</h3>
<p>
Dessin sur un renderer.
</p>
<h3>Baptiste Vallet</h3>
<p>
Animation de fenêtre.
</p>
</section>
<section>
<h2>Mardi 15 Juin</h2>
<h3>Margot Noyelle</h3>
<p>
Fin du jeu de la vie avec évènements
</p>
<h3>Lucie Soanen</h3>
<p>
Implémentation de la structure du tas binaire.
</p>
<h3>Baptiste Vallet</h3>
<p>
Manipulations et animation de sprites.
</p>
</section>
</main>
<nav class="nav-container">
<h2><a href="index.html">Page principale</a></h2>
<h2><a href="https://gitlab.isima.fr/lusoanen/projet_zz1_g1">Gitlab</a></h2>
<h2><a href="https://docs.google.com/spreadsheets/d/14a3eB31QkthkGVVAecEcV6-Z9DthQwR8UL2eY9XBZnQ/edit?usp=sharing"> Calendrier du projet</a></h2>
<h2><a href="#Contact">Nous contacter</a></h2>
</nav>
<footer>
<h2 id="Contact">Nous contacter :</h2>
<a href="mailto:margot.noyelle@etu.uca.fr"> Margot Noyelle </a><br>
<a href="mailto:lucie.soanen@etu.uca.fr"> Lucie Soanen </a><br>
<a href="mailto:baptiste.vallet@etu.uca.fr"> Baptiste Vallet </a><br>
</footer>
</body>
</html>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment