diff --git a/ressources/mayuri.png b/ressources/mayuri.png deleted file mode 100644 index 1cce24e46460f24f83580a510e3e45524d6fa6fa..0000000000000000000000000000000000000000 Binary files a/ressources/mayuri.png and /dev/null differ diff --git a/ressources/megumin.png b/ressources/megumin.png deleted file mode 100644 index cd4ba937108b82693c1c507effdd9dba7af4a19b..0000000000000000000000000000000000000000 Binary files a/ressources/megumin.png and /dev/null differ diff --git a/ressources/megumin_explosion.mp3 b/ressources/megumin_explosion.mp3 deleted file mode 100644 index f06e0608d2e24cd41aee3ec24eb3f0ce4fdc2461..0000000000000000000000000000000000000000 Binary files a/ressources/megumin_explosion.mp3 and /dev/null differ diff --git a/ressources/tuturu.mp3 b/ressources/tuturu.mp3 deleted file mode 100644 index 6a66645231f01da98daebdddaa8c62fa69a6a29b..0000000000000000000000000000000000000000 Binary files a/ressources/tuturu.mp3 and /dev/null differ diff --git a/scripts.js b/scripts.js index 99339c178c91fbc5f630e7544c24ca87a4488be1..9fe88a5d0cef0389ae820b40ea485d68d6120cb6 100644 --- a/scripts.js +++ b/scripts.js @@ -1,17 +1,4 @@ $(document).ready(function() { - // Chargement des sons - var megumin_explosion = new Audio("ressources/megumin_explosion.mp3"); - var tuturu = new Audio("ressources/tuturu.mp3"); - - // Volumes des sons - megumin_explosion.volume = 0.3; - tuturu.volume = 0.2; - - var sounds = [ // Tableau des sons - { "name": "megumin", "s": megumin_explosion }, - { "name": "mayuri", "s": tuturu } - ]; - var color = ["#F17105", "#D11149", "#6610F2", "#177CC5", "#92A500"]; // Couleurs var pics = ["asuka", "kumiko", "chitanda", "yohane"]; // Fonds @@ -32,7 +19,6 @@ $(document).ready(function() { // Changement aléatoire de l'image et de la couleur parce que pourquoi pas ? $("header").css("background-color", color[col_rd]); $("div.image").css("background", 'url("ressources/header_bg_crop_'+ pics[pic_rd] +'.png") 90% 90% / contain no-repeat'); - // $("div.image").css("background-size", "contain"); $(".container a").css("background", color[col_rd]); $("hr").css("border-color", color[col_rd]); $(".container a").hover(function(){ @@ -49,28 +35,6 @@ $(document).ready(function() { $( document ).ready(function() { // On change le style au chargement de la page et avec le bouton de refresh changeStyle(); - - // Choix aléatoire d'un son et personnage associé à la pression de l'avatar ! - var canPlay = true; - $("div.avatar").click(function() { - canPlay = true; // On peut jouer de l'audio - var sound_rd = Math.floor(Math.random() * sounds.length); - - for(i = 0; i < sounds.length; i++) { - if(!sounds[i]["s"].paused) { canPlay = false; } // Un audio est déjà joué : on attend - } - if(canPlay) { - sounds[sound_rd]["s"].play(); - $("div.avatar").css("background-image", 'url("ressources/'+ sounds[sound_rd]["name"] +'.png")'); - } - }); - - // Event listeners sur les sons - for(j = 0; j < sounds.length; j++) { - sounds[j]["s"].addEventListener('ended', function() { - $("div.avatar").css("background-image", 'url("https://avatars1.githubusercontent.com/u/12085737?s=400")'); - }); - } }); function hexToRgbA(hex, opacity = 0) { diff --git a/styles.css b/styles.css index 9833eacb6a488f2fa4ca7d27cc689a1eb49b3094..fee3860516208ed164666a030e77da42714b9b6e 100644 --- a/styles.css +++ b/styles.css @@ -147,7 +147,6 @@ div.avatar { border-radius: 100%; bottom: 15px; box-shadow: 0 0 7px rgba(0,0,0,0.25); - cursor: pointer; height: 50px; margin-left: 15px; transition: background 0.3s ease;