diff --git a/assets/css/hamburger.css b/assets/css/hamburger.css old mode 100755 new mode 100644 index c07bbcb..3d6ecbc --- a/assets/css/hamburger.css +++ b/assets/css/hamburger.css @@ -9,7 +9,84 @@ pointer-events: auto; } -#bar1, #bar2-1, #bar2-2, #bar3 { +#bar1 { + position: absolute; + width: 30px; + height: 3px; + background-color: #ffffff; + margin: 4px 0; + transition: 0.3s; +} + +#bar2 { + position: relative; + width: 3px; + height: 3px; + background-color: #ffffff; + margin: 4px 0; + transition: 0.3s; + +} + +#bar3 { + position: relative; + width: 3px; + height: 3px; + background-color: #ffffff; + margin: 4px 0; + transition: 0.3s; + +} + +#bar4 { + position: relative; + width: 3px; + height: 3px; + background-color: #ffffff; + margin: 4px 0; + transition: 0.3s; + +} +#bar5 { + position: relative; + width: 3px; + height: 3px; + background-color: #ffffff; + margin: 4px 0; + transition: 0.3s; + +} + +#bar6 { + position: relative; + width: 3px; + height: 3px; + background-color: #ffffff; + margin: 4px 0; + transition: 0.3s; + +} + +#bar7 { + position: relative; + width: 3px; + height: 3px; + background-color: #ffffff; + margin: 4px 0; + transition: 0.3s; + +} + + +#bar8{ + position: absolute; + width: 40px; + height: 5px; + background-color: #fff; + margin: 5px 0; + transition: 0.3s; +} +#bar9 { position: absolute; width: 40px; height: 5px; @@ -20,64 +97,115 @@ #bar1 { top: 0; + -webkit-transform: rotate(-30deg) translate(-10px, 10px); + transform: rotate(-45deg) translate(-10px, 12px); } -#bar2-1, #bar2-2 { - margin: 0; - width: 20px; - top: 50%; - transform: translateY(-50%); -} +#bar2 { + top: 0px; + right:-20px; -#bar2-1 { - left: 0; -} - -#bar2-2 { - right: 0; } #bar3 { - bottom: 0; + right: -28px; + bottom:9px; } -/* Mouse hovers the hamburger */ - -.change-hover #bar2-1 { - background-color: #ee293d; - transform: translate(-5px, -50%); +#bar4 { + bottom: 8PX; + left:36px; +} +#bar5 { + bottom: 21px; + left:34px; +} +#bar6 { + bottom: 2px; + left:-100px; /*je ne sais pas encore si je la mets ou pas*/ } -.change-hover #bar2-2 { - background-color: #ee293d; - transform: translate(5px, -50%); +#bar7 { + bottom: 23px; + right:-32px; } -.change-hover #bar1, .change-hover #bar3 { - background-color: #1a5dad; -} - - -/* Mouse clics the hamburger */ - -.change-clic #bar1 { +#bar8{ + top:0; + opacity:0; -webkit-transform: rotate(-45deg) translate(-10px, 10px); transform: rotate(-45deg) translate(-8px, 8px); } -.change-clic #bar2-1 { - opacity: 0; - -webkit-transform: translateX(-50%); - transform: translateX(-50%); -} - -.change-clic #bar2-2 { - opacity: 0; - -webkit-transform: translateX(50%); - transform: translateX(50%); -} - -.change-clic #bar3 { +#bar9{ + bottom:0; + opacity:0; -webkit-transform: rotate(45deg) translate(-10px, -10px); transform: rotate(45deg) translate(-10px, -10px); } +/* Mouse hovers the hamburger */ + +.change-hover #bar2 { + background-color: #254a33; +} +.change-hover #bar3 { + background-color: #254a33; +} +.change-hover #bar4 { + background-color: #254a33; +} +.change-hover #bar5 { + background-color: #254a33; +} +/*.change-hover #bar6 { + background-color: #254a33; +}*/ +.change-hover #bar7 { + background-color: #254a33; +} + + +.change-hover #bar1 { + background-color: #ad9500; +} + +.change-hover #bar8 { + background-color: #114165; +} +.change-hover #bar9 { + background-color: #114165; +} + +/* Mouse clics the hamburger */ + +.change-clic #bar1 { + opacity:0; +} + +.change-clic #bar2 { + opacity: 0; +} + +.change-clic #bar3 { + opacity: 0; +} + +.change-clic #bar4 { + opacity:0; +} +.change-clic #bar5 { + opacity:0; +} +/*.change-clic #bar6 { + opacity:0; +}*/ +.change-clic #bar7 { + opacity:0; + } + +.change-clic #bar8 { + opacity : 100; +} +.change-clic #bar9 { + opacity : 100; +} diff --git a/assets/css/score.css b/assets/css/score.css index 94cc009..f35aa14 100755 --- a/assets/css/score.css +++ b/assets/css/score.css @@ -53,7 +53,7 @@ font-size: 23px; } -.score-usa, .score-urss { +.score-usa, .score-urss, .score-boomsouffle, .score-verredaigle { font-size: 20px; line-height: 40px; text-align: center; @@ -78,29 +78,41 @@ background-size: auto 100%; text-shadow: 0 0 5px #000; } +.score-verredaigle{ + color: #fbce15; + background: url("../images/urss.png") no-repeat left ; + background-size: auto 100%; + text-shadow: 0 0 5px #000; +} +.score-boomsouffle{ + color: #fbce15; + background: url("../images/urss.png") no-repeat left ; + background-size: auto 100%; + text-shadow: 0 0 5px #000; +} -.score-separator{ +/*.score-separator{ font-size: 30px; line-height: 40px; text-align: center; color: #fff; text-shadow: 0 0 10px #000; -} +}*/ #main-score .score-logo { height: 60px; margin: 0 5px 0 5px; } -#main-score .score-usa, #main-score .score-urss, #main-score .score-separator { +#main-score .score-usa, #main-score .score-urss /*#main-score .score-separator*/ { font-size: 40px; line-height: 80px; } -#main-score .score-separator { +/*#main-score .score-separator { font-size: 55px; -} +}*/ #main-score .winning { font-size: 50px; diff --git a/assets/css/sidenav.css b/assets/css/sidenav.css index 19f0e84..1ced127 100755 --- a/assets/css/sidenav.css +++ b/assets/css/sidenav.css @@ -62,7 +62,7 @@ } .sidenav a .sidenav-content:hover { - color: #1a5dad; + color: #114165; padding-left: 40px; } diff --git a/assets/css/stats.css b/assets/css/stats.css index 98ac5e9..b6fcbb8 100755 --- a/assets/css/stats.css +++ b/assets/css/stats.css @@ -14,11 +14,17 @@ } .stats-table.stats-usa tr:hover { - background-color: #284550; + background-color: #f0d289; } .stats-table.stats-urss tr:hover { - background-color: #620f12; + background-color: #3b5941; +} +.stats-table.stats-boomsouffle tr:hover { + background-color: #f0d289; +} +.stats-table.stats-verredaigle tr:hover { + background-color: #f0d289; } .stats-toggle, .edit-stats th { @@ -30,8 +36,8 @@ } .stats-toggle#toggle-usa { - background-color: #1a5dad; - border-color: #1a5dad; + background-color: #F0BA00; + border-color: #F0BA00; -webkit-transition: 0.3s; -moz-transition: 0.3s; -ms-transition: 0.3s; @@ -40,14 +46,14 @@ } .stats-toggle#toggle-usa:hover { - background-color: #1f6fce; - border-color: #1f6fce; - box-shadow: 0 0 10px #1f6fce; + background-color: #f0c424; + border-color: #F0C424; + box-shadow: 0 0 10px #F0C424; } .stats-toggle#toggle-urss { - background-color: #d72229; - border-color: #d72229; + background-color: #275933; + border-color: #275933; -webkit-transition: 0.3s; -moz-transition: 0.3s; -ms-transition: 0.3s; @@ -56,11 +62,44 @@ } .stats-toggle#toggle-urss:hover { - background-color: #ee262d; - border-color: #ee262d; - box-shadow: 0 0 10px #ee262d; + background-color: #205929; + border-color: #205929; + box-shadow: 0 0 10px #205929; } +.stats-toggle#toggle-boomsouffle { + background-color: #F0BA00; + border-color: #F0BA00; + -webkit-transition: 0.3s; + -moz-transition: 0.3s; + -ms-transition: 0.3s; + -o-transition: 0.3s; + transition: 0.3s; +} + +.stats-toggle#toggle-boomsouffle:hover { + background-color: #f0c424; + border-color: #F0C424; + box-shadow: 0 0 10px #F0C424; +} + +.stats-toggle#toggle-verredaigle { + background-color: #F0BA00; + border-color: #F0BA00; + -webkit-transition: 0.3s; + -moz-transition: 0.3s; + -ms-transition: 0.3s; + -o-transition: 0.3s; + transition: 0.3s; +} + +.stats-toggle#toggle-verredaigle:hover { + background-color: #f0c424; + border-color: #F0C424; + box-shadow: 0 0 10px #F0C424; +} + + .stats-table .stat-log, .stats-table .stat-points { color: #1c1c1c; border-radius: 0; @@ -69,23 +108,41 @@ .stats-usa .stat-log, .stats-usa .stat-points { - background-color: #639fad; - border-color: #639fad; + background-color: #F0DB82; + border-color: #F0DB82; } .stats-usa td { - border-bottom: 1px solid #284550; + border-bottom: 1px solid #F0BA00; } .stats-urss .stat-log, .stats-urss .stat-points { - background-color: #d75556; - border-color: #d75556; + background-color: #395a4a; + border-color: #395A4A; } .stats-urss td { - border-bottom: 1px solid #620f12; + border-bottom: 1px solid #275933; } +.stats-boomsouffle .stat-log, .stats-boomsouffle .stat-points { + background-color: #F0DB82; + border-color: #F0DB82; +} + +.stats-boomsouffle td { + border-bottom: 1px solid #F0BA00; +} +.stats-verredaigle .stat-log, .stats-verredaigle .stat-points { + background-color: #F0DB82; + border-color: #F0DB82; +} + +.stats-verredaigle td { + border-bottom: 1px solid #F0BA00; +} + + .stat-log, .edit-header.stat-log { width: 80%; } @@ -145,13 +202,19 @@ } .edit-button#button-urss { - background: #ee293d; + background: #275933; } .edit-button#button-usa { - background: #1a5dad; + background: #F0BA00; } +.edit-button#button-boomsouffle { + background: #F0BA00; +} +.edit-button#button-verredaigle { + background: #F0BA00; +} .edit-button:hover, .edit-button#button-urss:hover, .edit-button#button-usa:hover { color: #000; background: #fafafa; @@ -216,23 +279,24 @@ input { } #add-line-usa { - background: #3a7eaa; + background: #F0BA00; } .add-line#add-line-usa:hover { - background: #53bbfc; - box-shadow: 0 0 5px #53bbfc; + background: #f0c424; + box-shadow: 0 0 5px #f0c424; } #add-line-urss { - background: #d72229; + background: #275933; } .add-line#add-line-urss:hover { - background: #ee293d; - box-shadow: 0 0 5px #ee293d; + background: #205929; + box-shadow: 0 0 5px #205929; } + .save-score { background: #21aa08; font-size: 30px; diff --git a/assets/css/style.css b/assets/css/style.css index 5744d68..b82471a 100755 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -412,7 +412,7 @@ Full-Width Styles } .main-link:hover{ - color: #1a5dad; + color: rgba(17, 65, 101, 0.8); } #main-link-container{ diff --git a/assets/images/bg_up.jpg b/assets/images/bg_up.jpg index 8ea2653..c4e6429 100755 Binary files a/assets/images/bg_up.jpg and b/assets/images/bg_up.jpg differ diff --git a/assets/scripts/timer.js b/assets/scripts/timer.js index f0a10a4..44e6283 100755 --- a/assets/scripts/timer.js +++ b/assets/scripts/timer.js @@ -1,5 +1,5 @@ // Set the date we're counting down to -var countDownDate = new Date("Sep 3, 2018 8:00:00").getTime(); +var countDownDate = new Date("Sep 2, 2019 8:00:00").getTime(); // Update the count down every 1 second var x = setInterval(function () { @@ -18,7 +18,7 @@ var x = setInterval(function () { // Output the result in an element with id="demo" document.getElementById("timer").innerHTML = "" + days + " jours, " + hours + " heures, " - + minutes + " minutes et " + seconds + " secondes avant la satellisation"; + + minutes + " minutes et " + seconds + " secondes avant de quitter les moldus"; // If the count down is over, write some text if (distance < 0) { diff --git a/classes/dao.php b/classes/dao.php index 5cf98a6..5355ed8 100755 --- a/classes/dao.php +++ b/classes/dao.php @@ -10,8 +10,9 @@ class Dao public function __construct($path_to_password) { if ($this->debug) { - $username = 'phpmyadmin'; - $password = $this->read_password($path_to_password); + $username = 'root'; + /* $password = $this->read_password($path_to_password);*/ + $password =''; $dsn = 'mysql:dbname=phpmyadmin;host=127.0.0.1'; } else { $username = 'accueil_insa'; diff --git a/coms.php b/coms.php index 512f124..a8dd191 100755 --- a/coms.php +++ b/coms.php @@ -5,102 +5,16 @@ ob_start(); // Start reading html

La liste de toutes les coms de ta semaine d'accueil, avec les contacts des responsables.

Facebook ?"; $comRespoPhoto = "assets/images/usa_logo.png"; $comRespo2Photo = "assets/images/usa_logo.png"; include("includes/coms/com_template.php"); -$comTitle = "COM Ins'cape Game"; -$comDescription = "Des énigmes pour sortir du campus"; -$comRespo = "Manon TARRADE"; -$comRespoId = "mtarade"; -$comRespoPhoto = "assets/images/usa_logo.png"; -include("includes/coms/com_template.php"); - -$comTitle = "COM ISS"; -$comDescription = "Pour découvrir la ville rose"; -$comRespo = "Baptiste LERAT"; -$comRespoId = "lerat"; -$comRespoPhoto = "assets/images/usa_logo.png"; -include("includes/coms/com_template.php"); - -$comTitle = "COM Walle-E"; -$comDescription = "Une journée dans la foret de Boucone, avec de nombreuses activités le matin ayant pour but de nettoyer la foret, et une piscine en accès libre l'après midi"; -$comRespo = "Nélia BAHRAOUI"; -$comRespoId = "bahraoui "; -$comRespoPhoto = "assets/images/usa_logo.png"; -$comRespo2 = "Lucas PERIN"; -$comRespo2Id = "lperin"; -$comRespo2Photo = "assets/images/urss_logo.png"; -include("includes/coms/com_template.php"); - -$comTitle = "COM Parrainage"; -$comDescription = "Ici pour vous aider à vous sentir moins perdus"; -$comRespo = "Léa LAXAGUE"; -$comRespoId = "laxague "; -$comRespoPhoto = "assets/images/usa_logo.png"; -$comRespo2 = "Blaise MAUGARD"; -$comRespo2Id = "bmaugard"; -$comRespo2Photo = "assets/images/urss_logo.png"; -include("includes/coms/com_template.php"); - -$comRespo2 = ""; - -$comTitle = "COM Hubble"; -$comDescription = "Souriez vous êtes filmés"; -$comRespo = "Lyana LETOURNEAU"; -$comRespoId = "lletourn"; -$comRespoPhoto = "assets/images/urss_logo.png"; -include("includes/coms/com_template.php"); - - -$comTitle = "COM Plaquette"; -$comDescription = "Grâce à eux vous avez des devoirs pendant les vacances"; -$comRespo = "Vincent SOISSONS"; -$comRespoId = "soissons"; -$comRespoPhoto = "assets/images/urss_logo.png"; -include("includes/coms/com_template.php"); - -$comId = "com_atterrissage"; -$comTitle = "COM Atterrissage"; -$comDescription = "Là pour sauver des vies"; -$comRespo = "Joan KO"; -$comRespoId = "ko"; -$comRespoPhoto = "assets/images/usa_logo.png"; -include("includes/coms/com_template.php"); - -$comTitle = "COM Ravitaillement"; -$comDescription = "La bouf !"; -$comRespo = "Zoé PHILIPPON"; -$comRespoId = "philippo"; -$comRespoPhoto = "assets/images/urss_logo.png"; -include("includes/coms/com_template.php"); - -$comTitle = "Space Bar"; -$comDescription = "La boisson !"; -$comRespo = "Louis GALZIN"; -$comRespoId = "galzin"; -$comRespoPhoto = "assets/images/urss_logo.png"; -include("includes/coms/com_template.php"); - -$comTitle = "Couteau Suisse"; -$comDescription = "Partout et nulle part à la fois..."; -$comRespo = "Lucas TAULAN"; -$comRespoId = "taulan"; -$comRespoPhoto = "assets/images/urss_logo.png"; -include("includes/coms/com_template.php"); - -$comTitle = "Oncle Sam"; -$comDescription = "L'oncle Sam est là pour vous servir !"; -$comRespo = "Samuel Navarro"; -$comRespoId = "navarro"; -$comRespoPhoto = "assets/images/usa_logo.png"; -include("includes/coms/com_template.php"); ?> - Site de la semaine d'accueil 2018 pour l'INSA Toulouse + Site de la semaine d'accueil 2019 pour l'INSA Toulouse

+