From 025959dd3d10f2c06d44985765014c788e2e2020 Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 21 Dec 2022 23:02:34 +0100 Subject: [PATCH 1/2] glaboulah --- static/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/css/main.css b/static/css/main.css index 3eed9d0..97e4fa9 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -137,6 +137,10 @@ a:hover { width: 50vw; } +.away { + transform: translate(-900vw, -100vh); +} + .form-group { margin: 10px; width: 100%; From 15ffe97a2dd9acef639452a1339482cd6275fafc Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 21 Dec 2022 23:43:56 +0100 Subject: [PATCH 2/2] JE TE DEFI YUGI, BLUE EYES WHITE BLACK DRAGON BLUE --- static/css/main.css | 4 +++- static/js/main.js | 25 +++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/static/css/main.css b/static/css/main.css index 349d0b9..0410af5 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -73,6 +73,8 @@ a:hover { background: url("../img/background-letter.jpg"); background-size: cover; background-position: right; + + transition: 1.5s transform 0s ease-out; } #logo { @@ -139,7 +141,7 @@ a:hover { } .away { - transform: translate(-900vw, -100vh); + transform: translate(-200vw, -100vh) rotate(-10deg); } .form-group { diff --git a/static/js/main.js b/static/js/main.js index 288a118..5ad6718 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -3,16 +3,29 @@ const base_url = "https://oss110metz.rezo-rm.fr/" var page = ['#main-page', '#admin-page', '#login-page', '#demande-page']; var historyHandler = []; window.onpopstate = history.onpushstate = function(e) { - show_page(e.state); + if (e.state) { + show_page(e.state, true); + } else { + history.back(); + } }; history.pushState("#main-page", "", "") -function show_page(id) { +function show_page(id, historyPush) { + //si le z-index de la nouvelle page est inférieur on fait un transi 'forward' sinon 'backward' for(i in page) { - $(page[i]).hide(); + $(page[i]).hide().removeClass("away"); + } + + $hs = $(history.state).show(); + if(!historyPush) + $hs.addClass('away'); + $id = $(id).show(); + + + if(!historyPush) { + history.pushState(id, "", "") } - $(id).show(); - history.pushState(id, "", "") } $("#login-button").click(function (e) { @@ -59,7 +72,7 @@ $(window).on("load", function() { } for(i in page) { - $(page[i]).css('z-index', i); + $(page[i]).css('z-index', page.length - i); } /* load timer */