22 Commits

Author SHA1 Message Date
margarita 5bf5b7a3bc triviagmatico 30/09/26 a 13:30 2026-10-01 12:07:47 +02:00
jorge e8accf949e revert 7f70112f63
revert Merge pull request 'Fix inicia partida todos los usuarios' (#21) from partida into main

Reviewed-on: #21
2026-10-01 11:16:36 +02:00
jorge fa883cde39 revert eed77db62f
revert Subir archivos a "controladores"
2026-10-01 11:16:20 +02:00
jorge ae213a3d12 revert a66ac7086d
revert Subir archivos a "js"
2026-10-01 11:16:14 +02:00
jorge cd0685f41c revert 71fb45b94c
revert Merge branch 'main' of https://git.desarrolloalcala.com/jorge/triviagmatico
2026-10-01 11:15:10 +02:00
jorge e3395a017c revert 8d5d7da615
revert Merge pull request 'Resultados victor' (#25) from resultados_victor into main

Reviewed-on: #25
2026-10-01 11:13:07 +02:00
jorge 396aca8b03 revert c6db380ef9
revert Merge branch 'main' of https://git.desarrolloalcala.com/jorge/triviagmatico
2026-10-01 11:12:58 +02:00
jorge c6db380ef9 Merge branch 'main' of https://git.desarrolloalcala.com/jorge/triviagmatico 2026-10-01 10:53:03 +02:00
jorge 8d5d7da615 Merge pull request 'Resultados victor' (#25) from resultados_victor into main
Reviewed-on: #25
2026-10-01 10:52:42 +02:00
jorge 7f70112f63 Merge pull request 'Fix inicia partida todos los usuarios' (#21) from partida into main
Reviewed-on: #21
2026-10-01 10:49:10 +02:00
dbvictor2002 a66ac7086d Subir archivos a "js" 2026-10-01 10:47:05 +02:00
dbvictor2002 eed77db62f Subir archivos a "controladores" 2026-10-01 10:46:36 +02:00
dbvictor2002 83545152bb Subir archivos a "/" 2026-10-01 10:46:12 +02:00
jorge 71fb45b94c Merge branch 'main' of https://git.desarrolloalcala.com/jorge/triviagmatico 2026-10-01 08:58:45 +02:00
jorge 5b6352b4ee Merge pull request 'Css' (#23) from css into main
Reviewed-on: #23
2026-09-30 13:25:02 +02:00
Isaac 7e1344a395 Arreglado CSS modal crear pregunta en perfil 2026-09-30 13:15:52 +02:00
Isaac db5061ec7f Ajustes a la tabla para dejarla buena, bonita y barata 2026-09-30 13:08:04 +02:00
Isaac 737b76e83b Ajuste texto para host 2026-09-30 12:48:38 +02:00
Isaac 3705a9ea9e Ajuste CSS más acorde 2026-09-30 12:41:50 +02:00
Isaac 72134b405c Arreglado CSS botón "Unirse" 2026-09-30 12:31:50 +02:00
jorge 2531ef321a cabecera mvc modificada 2026-09-30 11:08:09 +02:00
dbvictor2002 5446352cf9 Fix inicia partida todos los usuarios 2026-09-30 10:21:43 +02:00
6 changed files with 25 additions and 9 deletions
+1 -1
View File
@@ -71,7 +71,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancelar</button>
<button type="button" class="btn btn-kahoot-login" id="btnCrearSala">Crear sala</button>
<button type="button" class="btn btn-kahoot-register" id="btnCrearSala">Crear sala</button>
</div>
</div>
</div>
+2 -1
View File
@@ -77,8 +77,9 @@
}
.btn-unirse:hover {
background-color: #0f56ab;
background-color: #1f6f09;
color: white;
transform: translateY(-2px);
}
.modal-kahoot {
+15
View File
@@ -401,3 +401,18 @@
}
}
.modal-kahoot {
border: none;
border-radius: 20px;
overflow: hidden;
box-shadow: 0 15px 40px rgba(0, 0, 0, 0.25);
}
.modal-kahoot-header {
background-color: var(--kahoot-purple);
color: white;
border-bottom: none;
}
+1 -1
View File
@@ -276,7 +276,7 @@ $(document).on("click", ".btn-abandonar-sala", function () {
mensaje.text(
"Si abandonas la sala como anfitrión, la partida terminará para todos los jugadores.",
);
botonConfirmar.text("Sí, abandonar");
botonConfirmar.text("Sí, terminar partida");
} else {
titulo.text("¿Abandonar la sala?");
mensaje.text(
+5 -5
View File
@@ -36,11 +36,11 @@ function renderizarTablaRanking(jugadores) {
<thead class="table-dark">
<tr>
<th scope="col" style="width: 10%;">#</th>
<th scope="col" class="text-start" style="width: 35%;">Jugador</th>
<th scope="col" style="width: 15%;"><i class="fa-solid fa-trophy text-warning me-1"></i> Vic</th>
<th scope="col" style="width: 15%;"><i class="fa-solid fa-xmark text-danger me-1"></i> Der</th>
<th scope="col" style="width: 15%;"><i class="fa-solid fa-bullseye text-success me-1"></i> Aciertos</th>
<th scope="col" style="width: 10%;"><i class="fa-solid fa-percent text-info me-1"></i> % Vic</th>
<th scope="col" class="text-start" style="width: 30%;"><i class="fa-solid fa-user"></i> <br> Jugador</th>
<th scope="col" style="width: 15%;"><i class="fa-solid fa-trophy text-warning me-1"></i> <br> Victorias</th>
<th scope="col" style="width: 15%;"><i class="fa-solid fa-xmark text-danger me-1"></i> <br> Derrotas</th>
<th scope="col" style="width: 15%;"><i class="fa-solid fa-bullseye text-success me-1"></i> <br> Aciertos</th>
<th scope="col" style="width: 15%;"><i class="fa-solid fa-medal text-info me-1"></i> <br> Efectividad</th>
</tr>
</thead>
<tbody>
+1 -1
View File
@@ -293,7 +293,7 @@ $avatarUsuario = htmlspecialchars($_SESSION['avatar'] ?? 'img/avatars/defaultPro
Cancelar
</button>
<button type="submit" form="formCrearPregunta" class="btn btn-kahoot-login" id="btnCrearPregunta">
<button type="submit" form="formCrearPregunta" class="btn btn-kahoot-register" id="btnCrearPregunta">
<i class="bi bi-check-lg me-1"></i>
Crear pregunta
</button>