From 472a2179076c4990e2bb0dea9e0bdb00cf8305f7 Mon Sep 17 00:00:00 2001 From: frperalde Date: Mon, 18 Jan 2021 12:43:02 +0100 Subject: [PATCH] =?UTF-8?q?Avanc=C3=A9e=20oral?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SwichGIT/src/css/PageDaccueil.css | 7 +--- SwichGIT/src/css/PartieGame.css | 4 +- SwichGIT/src/css/desktops.css | 11 +++-- SwichGIT/src/index.html | 12 +----- SwichGIT/src/js/main.js | 67 ------------------------------- 5 files changed, 9 insertions(+), 92 deletions(-) diff --git a/SwichGIT/src/css/PageDaccueil.css b/SwichGIT/src/css/PageDaccueil.css index de5e84c..9368e35 100644 --- a/SwichGIT/src/css/PageDaccueil.css +++ b/SwichGIT/src/css/PageDaccueil.css @@ -332,19 +332,14 @@ label:active:after { .bouttonvalider:hover { box-shadow: 0 0 0 8px var(--lightsedonca); - font-size: 99%; + font-size: 100%; position: relative; - height: 93%; - width:95%; - top: 4%; transition: box-shadow 0.2s ease; } #bouttonvalider:hover { box-shadow: 0 0 0 5px var(--lightsedonca); - font-size: 120%; position: relative; - right: 5%; } #pseudoenter { diff --git a/SwichGIT/src/css/PartieGame.css b/SwichGIT/src/css/PartieGame.css index 9d4bfcb..84e55f8 100644 --- a/SwichGIT/src/css/PartieGame.css +++ b/SwichGIT/src/css/PartieGame.css @@ -23,8 +23,8 @@ text-align: center; font-family: Montserrat, impact, Arial Black; font-size: 2.5vw; - margin-top: 2vw; - margin-left: 25vw; + margin-top: 1%; + margin-left: 28vw; color: var(--lightsedonca); } diff --git a/SwichGIT/src/css/desktops.css b/SwichGIT/src/css/desktops.css index 6f0704a..e49dab1 100644 --- a/SwichGIT/src/css/desktops.css +++ b/SwichGIT/src/css/desktops.css @@ -26,7 +26,6 @@ .flex-item { background: var(--lightsedonca); width: 10vw; - height: 13vw; border-radius: 0.75vw; padding-right: 0.15vw; padding-left: 0.15vw; @@ -35,6 +34,7 @@ display: flex; margin-right: 0.4vw; margin-left: 0.4vw; + margin-bottom: 1vw; -webkit-flex-flow: row wrap; justify-content: space-around; } @@ -49,12 +49,11 @@ } .containcards { - height: 87vh; overflow-x: auto; display: flex; flex-wrap: wrap; - padding-left: 3vw; - padding-top: 2.5vw; + padding-left: 5%; + padding-top: 7vw; } .logop2 img { @@ -94,7 +93,7 @@ position: absolute; border-radius: 45px; left: 9.2vw; - top: 5.5vw; + top: 3.5vw; height: 4vw; width: 12vw; background-color: var(--lightsedonca); @@ -127,8 +126,8 @@ position: absolute; font-size: 2.5vw; margin-top: 0.2vw; - margin-left: 2.7vw; color: var(--lightsedonca); text-align:center; + width: inherit; } } diff --git a/SwichGIT/src/index.html b/SwichGIT/src/index.html index 65d248b..8bfa2b3 100644 --- a/SwichGIT/src/index.html +++ b/SwichGIT/src/index.html @@ -559,11 +559,6 @@
-
-
- -
-
@@ -571,11 +566,6 @@
-
@@ -590,7 +580,7 @@
-

Modedddd

+

Solo

diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index 34c3db4..ebe14dc 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -262,20 +262,12 @@ function journuit() { //changer logo swish document.getElementById("imglogo").src = "imgs/swishjour.png"; document.getElementById("imglogo2").src = "imgs/swishjour.png"; - /* - MESSAGE POUR CEUX QUI FONT LES TESTS ! Recommentez les lignes après ! Merci - */ - //document.getElementById("fondinput").style.backgroundColor = lightsedonca; document.getElementById("contourbuttonvalider").style.backgroundColor = lightsedonca; - //document.getElementById("textjouer").style.color = lightsedonca; - //document.getElementById("textplus").style.color = lightprima; //changer montagnesfond document.getElementById("mount1").src = "imgs/mount1.png"; document.getElementById("mount2").src = "imgs/mount2.png"; //nuages document.getElementById("cloud").src = "imgs/lightcloud.png"; - //changer background color - //document.getElementById("containplayers").style.color = lightsedonca; //maj couleur principales document.documentElement.style.setProperty('--lightprima', lightprima); document.documentElement.style.setProperty('--lightsedonca', lightsedonca); @@ -286,18 +278,12 @@ function journuit() { //changer logo swish document.getElementById("imglogo").src = "imgs/swishnuit.png"; document.getElementById("imglogo2").src = "imgs/swishnuit.png"; - - //document.getElementById("fondinput").style.backgroundColor = darkseconda; document.getElementById("contourbuttonvalider").style.backgroundColor = darkseconda; - //document.getElementById("textjouer").style.color = darkseconda; - //document.getElementById("textplus").style.color = darkprima; //changer montagnesfond document.getElementById("mount1").src = "imgs/darkmount1.png"; document.getElementById("mount2").src = "imgs/darkmount2.png"; //nuages document.getElementById("cloud").src = "imgs/darkcloud.png"; - //mode nuit - //document.getElementById("containplayers").style.color = darkseconda; //maj couleur principales document.documentElement.style.setProperty('--lightprima', darkprima); document.documentElement.style.setProperty('--lightsedonca', darkseconda); @@ -1053,59 +1039,6 @@ function SommeDeCarte(CarteMere, CarteFille) { -function ChoisirPseudo() { - let nom = localStorage.getItem('nom'); - if (nom == null) { - nom = "SWISH"; - } - document.getElementById('inputpseudo').setAttribute('value', nom); -}; - -function EnvoyerNouveauNom() { - - let pseudo = document.getElementById('inputpseudo').value; - localStorage.setItem('nom', pseudo); - document.location.reload(true); - -}; - - - - -function addplayer(){ - //j'ai mis une limite de 6joueurs, mais c'est a voir - if(nbplayers < 7){ - //creation de la div contenant le pseudo - var divpseudo = document.createElement('div'); - divpseudo.id = 'pseudolist'; - //reprise du pseudo entre par le joueur - var pseudo = document.getElementById("inputpseudo").value; - //verification si pseudo vide pour lui donner un pseudo du style "Joueur3" - if(pseudo == "") - { - pseudo = "Joueur " + nbplayers; - } - //creation du text-pseudo - var tag = document.createElement("p"); - tag.className = "pseudojoueur"; - var text = document.createTextNode(pseudo); - tag.appendChild(text); - //mise du text dans la division - divpseudo.appendChild(tag); - //insertion pseudo dans liste - document.getElementById("containplayers").appendChild(divpseudo); - //remise input vide ;) - document.getElementById("inputpseudo").value = ""; - nbplayers = nbplayers +1; - } -} - -function ajouterplayer(event){ - if(event.keyCode == 13) - addplayer(); -} - - function doublonInterdit(uneCarte) { var lesCoPetit = [];