diff --git a/assets/css/sidenav.css b/assets/css/sidenav.css index f1ba6d7..b23fd30 100644 --- a/assets/css/sidenav.css +++ b/assets/css/sidenav.css @@ -5,7 +5,7 @@ width: 250px; margin-left: -250px; /* change margin with JavaScript */ position: fixed; /* Stay in place */ - z-index: 10; + z-index: 1000; top: 0; left: 0; background-color: #111111; @@ -28,8 +28,8 @@ } .sidenav a:hover { - color: white; - text-shadow: 2px 2px 5px #fff; + color: #c5af86; + text-shadow: 0 0 5px #c5af86; } /* Style page content - use this if you want to push the page content to the right when you open the side navigation */ diff --git a/assets/css/style.css b/assets/css/style.css index 7e6c7ab..81e33a9 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -32,7 +32,7 @@ Theme Styles body { /*Full page background*/ background-size: cover; - background: url("../images/header_bg.jpg") no-repeat fixed center; + background: url("../images/bg.jpg") no-repeat fixed center; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; @@ -84,18 +84,19 @@ p { footer p { color: #f2f2f2; + text-shadow: 0 0 2px black; } a { text-decoration: none; - color: #0F79D0; + color: #3a7eaa; text-shadow: none; transition: 0.3s; } a:hover, a:focus { - color: #222e73; - text-decoration: underline; + color: #503c3b; + text-shadow: 0 0 4px #cccccc; } footer a { @@ -190,7 +191,7 @@ Full-Width Styles position: fixed; width: 100%; height: 50px; - z-index: 15; + z-index: 2000; box-shadow: 0 2px 5px #222; } @@ -233,6 +234,7 @@ Full-Width Styles padding-top: 100px; background-color: #212121aa; border-radius: 0 0 60px 60px; + box-shadow: 0 0 40px #212121; } #home_content h1 { @@ -297,9 +299,9 @@ Full-Width Styles position: fixed; width: 100%; height: 100%; - background-color: #212121; + background-color: #000; opacity: 0; - z-index: -1; + z-index: -100; transition: 0.3s; } @@ -315,7 +317,7 @@ Full-Width Styles } .active_background { - z-index: 5 !important; + z-index: 100 !important; opacity: 0.7 !important; } diff --git a/assets/images/bg.jpg b/assets/images/bg.jpg index ff8706e..ffe7026 100644 Binary files a/assets/images/bg.jpg and b/assets/images/bg.jpg differ diff --git a/assets/images/header_bg.jpg b/assets/images/header_bg.jpg deleted file mode 100644 index ff8706e..0000000 Binary files a/assets/images/header_bg.jpg and /dev/null differ diff --git a/assets/images/planning.png b/assets/images/planning.png deleted file mode 100644 index a7b8189..0000000 Binary files a/assets/images/planning.png and /dev/null differ diff --git a/assets/scripts/photosScript.js b/assets/scripts/photosScript.js index d30c926..5e24f59 100644 --- a/assets/scripts/photosScript.js +++ b/assets/scripts/photosScript.js @@ -2,17 +2,27 @@ var showcase = $("#img_big"); var showcaseLink = $("#img_big_link"); var photoBackButton = $("#photo_back_button"); +/* + * Display selected image in showcase + * When clicked, display image in full size + */ function displayBig(elem) { - showcase.attr("src", $(elem).attr('src')); - showcaseLink.attr("href", $(elem).attr('src')); + changeImage($(elem).attr('src')); photoBackButton.css("display", "block"); - console.log("yop"); } + +/* + * Hide showcase image + */ function closeBig() { photoBackButton.css("display", "none") } + +/* + * Display next/last image in showcase. When reaching end/start, loop back to start/end + */ function displayNext(direction) { var currentSrc = showcase.attr('src'); var photos = document.getElementsByClassName("photo"); @@ -33,5 +43,13 @@ function displayNext(direction) { nextId = "#photo-" + next; } var nextSrc = $(nextId).attr('src'); - showcase.attr('src', nextSrc); + changeImage(nextSrc); +} + +/* + * Change image source and link + */ +function changeImage(src) { + showcase.attr("src", src); + showcaseLink.attr("href", src); } diff --git a/assets/scripts/planningScript.js b/assets/scripts/planningScript.js index e098e19..6c72b43 100644 --- a/assets/scripts/planningScript.js +++ b/assets/scripts/planningScript.js @@ -1,6 +1,10 @@ var current = null; var classes = null; $(document).ready(function () { + + /* + * Display clicked event as selected, change info box content and scroll to it + */ $(".event").click(function () { /* Reset last selected items */ if (current != null) { @@ -15,6 +19,10 @@ $(document).ready(function () { scrollTop: $("#infoBox").offset().top }, 300); }); + + /* + * Display shadow on hovered events + */ $(".event").hover(function () { var element = this.className.split(" ")[1]; if (element != current) { @@ -27,6 +35,9 @@ $(document).ready(function () { } }); + /* + * Display shadow under all elements with the save eventName + */ function setEventShadow(eventName, shadow) { classes = document.getElementsByClassName(eventName); for (var i = 0; i < classes.length; i++) { diff --git a/assets/scripts/sidenavScript.js b/assets/scripts/sidenavScript.js index 65a00b6..af7c1d3 100644 --- a/assets/scripts/sidenavScript.js +++ b/assets/scripts/sidenavScript.js @@ -3,24 +3,36 @@ var sidenav = $("#menuSidenav"); var hamburger = $("#hamburger"); var backButton = $("#back_button"); +/* + * Open navigation menu, change Hamburger icon to selected state + * and display the back button overlay over the page + */ + function openNav() { sidenav.css("margin-left", "0"); sidenav.css("box-shadow", "5px 5px 10px #151515"); backButton.addClass("active_background"); enableHamburger(); - /* Enables hamburger icon */ menuOpen = true; } + +/* + * Close navigation menu, change Hamburger icon back to default state + * and hide the back button overlay + */ function closeNav() { sidenav.css("margin-left", "-250px"); sidenav.css("box-shadow", "none"); backButton.removeClass("active_background"); disableHamburger(); - /* Disables hamburger icon */ menuOpen = false; } + +/* + * Toggle the navigation bar + */ function toggleNav() { if (menuOpen) { closeNav(); diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..bdf48fc Binary files /dev/null and b/favicon.ico differ diff --git a/includes/sidenav.html b/includes/sidenav.html index 2f9bf12..b4c6f3c 100644 --- a/includes/sidenav.html +++ b/includes/sidenav.html @@ -6,5 +6,5 @@ La Prévention Les Photos
- Les Contacts + Les Infos diff --git a/index.php b/index.php index de41e2a..af4ad41 100644 --- a/index.php +++ b/index.php @@ -22,6 +22,7 @@ include("includes/sidenav.html");

Semaine d'Accueil 2018

Ce site regroupe les informations les plus importantes pour que ta semaine d'accueil se déroule dans les meilleures conditions.

+

Utilise le menu en haut à gauche pour naviguer sur le site.

diff --git a/contact.php b/infos.php similarity index 58% rename from contact.php rename to infos.php index d7a171c..129059a 100644 --- a/contact.php +++ b/infos.php @@ -9,6 +9,20 @@ ob_start(); // Start reading html class="fas fa-envelope"> Mail : aaaaa

Pour toute demande concernant une activité/COM spécifique, allez sur la page des COMs pour contacter le responsable approprié.

+ +

Credits

+

Voici les différentes technologies et ressources que ce site utilise :

+

Icons8 | Fond du site

+JQuery +
+JavaScript +
+PHP7 +
+HTML5 +
+CSS3 + -
- -
-
-
-
-
-
- -
-
-
+
+ +
+
-

Semaine d'Accueil 2018

-

-
-
+

Semaine d'Accueil 2018

+

+
+
-
-
- -
-
+
+
+ +
+
- - + +