diff --git a/css/styles.css b/css/styles.css index cc8bfd99ccc0fb9fd459d790fd3f8731342f5363..d240a93f5f8e1a23cc454b46e71c7e4ea9314e7c 100644 --- a/css/styles.css +++ b/css/styles.css @@ -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;} diff --git a/html/chercherUnRepas.html b/html/chercherUnRepas.html index 21fe88a22bb757c15482e3a20b3441d8281ead4c..5b6fe3981a0dae6a6874f139d15971184227c23c 100644 --- a/html/chercherUnRepas.html +++ b/html/chercherUnRepas.html @@ -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> diff --git a/html/listeFrigos.html b/html/listeFrigos.html index 7af931cf498499f4e06103c62071f14b3b8dac7d..0418bbb54e41db1a76e3f9263d94ff9664bf1c52 100644 --- a/html/listeFrigos.html +++ b/html/listeFrigos.html @@ -1,25 +1,12 @@ <!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); diff --git a/html/membres.html b/html/membres.html index 573f7d4654f85b322d926ee8234b7712bf21822e..9acb165d2a719ed5b45b26fb4fc66418b1daddcf 100644 --- a/html/membres.html +++ b/html/membres.html @@ -1,42 +1,4 @@ <!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> diff --git a/html/panier.html b/html/panier.html index d194e4a7c1bf60c8b68a3d377e73d2a4ea116a44..157756bc48985f3fdada7f56a153f1d23bfb3c0e 100644 --- a/html/panier.html +++ b/html/panier.html @@ -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 diff --git a/html/profil.html b/html/profil.html index c301bd5184b74181b975da8b78a4adcd7f41ea2e..3f9ad3dfc81d0eb43c1b32aecf6f3fde06377323 100644 --- a/html/profil.html +++ b/html/profil.html @@ -6,6 +6,7 @@ <title>Profil</title> </head> <body> + <br> <p class="titleSection">Mon profil</p> </body> </html> \ No newline at end of file