Skip to content
Snippets Groups Projects
Commit 73cab5f0 authored by Jimmy Bell's avatar Jimmy Bell
Browse files

merge

parents f1a8bad0 9bdd9715
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
css/styles.css
+ 61
− 0
View file @ 73cab5f0
......@@ -11,6 +11,10 @@ iframe {
border: none;
}
.bold {
font-weight: bold;
}
.btn{
left: 0px;
top: 0px;
......@@ -127,6 +131,17 @@ iframe {
margin: 3px 0px -3px -10px;
}
.fridgeOutline {
border-radius: 25px;
background-color: #F2F2F2;
padding-left: 67px;
padding-top: 17px;
padding-bottom: 17px;
width: 895px;
height: 66px;
margin-left: 119px;
}
.grey-label{
margin-left: 15px;
......@@ -192,6 +207,34 @@ iframe {
outline: none;
}
.memberTab {
overflow: hidden;
border: none;
background-color: white;
}
/* Style the buttons that are used to open the tab content */
.memberTab button {
margin: 6px 3px;
background-color: inherit;
float: inside;
border: none;
border-radius: 20px;
outline: none;
cursor: pointer;
transition: 0.3s;
color: white;
font-size: 16px;
width: 230px;
height: 45px;
display: inline;
background-color: #53bdbd;
}
.memberTab button.active{
background-color: #e6881a;
}
.member-space-access {
display: none;
position: fixed;
......@@ -330,10 +373,21 @@ iframe {
animation: fadeEffect 1s; /* Fading effect takes 1 second */
}
.tabcontent-members {
display: block;
animation: fadeEffect 1s; /* Fading effect takes 1 second */
}
.teal {
color: #008c8c;
}
.tealBackground{
width: 1200px;
height: 624px;
background-color: #008C8C;
}
.titleBar{
height: 28px;
......@@ -417,6 +471,11 @@ iframe {
font-size: 12px;
}
#memberSectionTab{
background-color: white;
color: #008C8C;
}
#rules {
display: block;
float: left;
......@@ -426,6 +485,8 @@ iframe {
float: right;
}
/* Go from zero to full opacity */
@keyframes fadeEffect {
from {opacity: 0;}
......
html/chercherUnRepas.html
+ 1
− 0
View file @ 73cab5f0
......@@ -6,6 +6,7 @@
<title>Chercher un repas</title>
</head>
<body>
<br>
<p class="titleSection">Chercher un repas</p><br>
<form class="search-form" id="form">
<input type="text" class="search-textbox" placeholder="Écrire votre repas" name="textbox"><br><br>
......
html/listeFrigos.html
+ 2
− 15
View file @ 73cab5f0
<!DOCTYPE html>
<html lang="en">
<style>
.fridgeOutline {
border-radius: 25px;
background: #F2F2F2;
padding-left: 67px;
padding-top: 17px;
padding-bottom: 17px;
}
.bold {
font-weight: bold;
}
</style>
<head>
<link rel="stylesheet" href="../css/styles.css">
<meta charset="UTF-8">
<title>Liste des frigos</title>
</head>
<body id="listeFrigo" onload="retrieveFrigos()">
<p class="titleSection">Mon profil</p>
</body>
<script src="../scripts/readJson.js"></script>
<script src="../scripts/openTabsFromListeFrigos.js"></script>
......@@ -36,7 +23,7 @@
' Situé à '+obj.array[i].distance+' mètres\n' +
' </div>'
}
document.getElementById("listeFrigo").innerHTML= builtUpHTML;
document.getElementById("listeFrigo").innerHTML+= builtUpHTML;
}
function saveFrigoIndex(event, index){
sessionStorage.setItem('frigoIndex', index);
......
html/membres.html
+ 2
− 40
View file @ 73cab5f0
<!DOCTYPE html>
<style>
.memberTab {
overflow: hidden;
border: none;
background-color: white;
}
/* Style the buttons that are used to open the tab content */
.memberTab button {
margin: 6px 3px;
background-color: inherit;
float: inside;
border: none;
border-radius: 20px;
outline: none;
cursor: pointer;
transition: 0.3s;
color: white;
font-size: 16px;
width: 230px;
height: 45px;
display: inline;
background-color: #53bdbd;
}
.memberTab button.active{
background-color: #e6881a;
}
.tealBackground{
height: 579px;
background-color: #008C8C;
}
#memberSectionTab{
background-color: white;
color: #008C8C;
}
</style>
<html lang="en">
<head>
<link rel="stylesheet" href="../css/styles.css">
......@@ -60,8 +22,8 @@
<div class="tealBackground">
<div id="listeFrigos" class="tabcontent active">
<iframe id="mbrcontent" src="listeFrigos.html" width="98%" height="800"></iframe>
<div id="listeFrigos" class="tabcontent-members active">
<iframe id="mbrcontent" src="listeFrigos.html" width="100%" height="800"></iframe>
</div>
</div>
</div>
......
html/panier.html
+ 1
− 0
View file @ 73cab5f0
......@@ -6,6 +6,7 @@
<title>Mon Panier</title>
</head>
<body>
<br>
<p class="titleSection">Mon panier</p>
</body>
</html>
\ No newline at end of file
html/profil.html
+ 1
− 0
View file @ 73cab5f0
......@@ -6,6 +6,7 @@
<title>Profil</title>
</head>
<body>
<br>
<p class="titleSection">Mon profil</p>
</body>
</html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment