Skip to content

Commit

Permalink
Sergio dev sin vendor (#75)
Browse files Browse the repository at this point in the history
* Arreglos navbar, barrabuscar, moviles, modosoruo, mailer y usuario

navbar en todas las paginas ya bien
barra buscar playlist ya bien centrada no se baja pa abajjo
arreglado navbar moviles
arreglado modo oscuro
rutas mailer
areglado el usuario.php se veia fatal

* cambio url mailer

* Brute force

Quito el vendor para hacer la PR sin él

---------

Co-authored-by: Sergio :) <[email protected]>
  • Loading branch information
spariva and sergioserrano3 committed Jun 8, 2024
1 parent 52c473a commit cd15a27
Show file tree
Hide file tree
Showing 179 changed files with 107 additions and 23,565 deletions.
42 changes: 0 additions & 42 deletions public/contacto.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,48 +10,6 @@


?>

<!-- <!DOCTYPE html>
<html lang="es">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" href="https://developer.spotify.com/images/guidelines/design/[email protected]" type="image/png">
<title>Music-Life</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="./css/navbar.css">
<link rel="stylesheet" type="text/css" href="./css/contacto.css">
<script src="./js/script.js" defer></script>
</head>

<body>
<video id="videoFondo" autoplay="true" muted="true" loop="true" disablePictureInPicture loading="eager" playsinline></video>

<header id="header">
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="d-flex align-items-center">
<a class="textoCabecera" href="./index.php" id="logo">Music-Life</a> -->

<!-- desplegable para pantallas pequeñas -->
<!-- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
</div>

<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav ml-auto">
<!--<li class="nav-item"><a class="nav-link" href="./login.php">Cuenta</a></li>-->
<li class="nav-item"><a class="nav-link" href="./usuario.php">Usuario</a></li>
<li class="nav-item"><a class="nav-link" href="./spotify.html">Spotify</a></li>
<li class="nav-item"><a class="nav-link" href="./contacto.php">Contacto</a></li>
<li class="nav-item"><a class="nav-link" href="https://github.com/spariva/Music-Life" target="_blank">Info</a></li>
<li class="nav-item"><a class="nav-link" id="modo-oscuro">Modo Oscuro</a></li>
</ul>
</div>
</nav>
</header> -->
<div id="contenido">
<div class="content" id="formContacto">
<h2 class="textoContacto">Formulario de Contacto</h2><br>
Expand Down
17 changes: 1 addition & 16 deletions public/css/navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,11 @@ video {
#logo {
display: block;
font-size: 32px;
text-decoration: none;
text-decoration: none;
font-weight: 550;
font-family: popText, Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif;
}

.textoCabecera {
color: black;
}

/* Para poder hacer el navbar de bootstrap transparente */
.navbar {
display: flex;
Expand Down Expand Up @@ -90,13 +86,6 @@ video {
cursor: pointer;
}

.bg-negro{

}

.bg-blanco{
}

/*Modo para moviles*/
/* Media query para pantallas pequeñas */
@media screen and (max-width: 1000px) {
Expand Down Expand Up @@ -190,10 +179,6 @@ video {
text-align: center;
}

#botonBuscar {
padding: 10px;
}

#mensaje {
text-align: center;
z-index: 100;
Expand Down
8 changes: 2 additions & 6 deletions public/css/nuevoStyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@

#logo {
font-size: 32px;
text-decoration: none;
/* text-decoration: none; */
font-weight: 550;
font-family: popText, Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif;
}

.textoCabecera {
color: black;
/* font-family: popText, Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif; */
}

.navbar a {
Expand Down
21 changes: 18 additions & 3 deletions public/css/nuevocss.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ body {

/* Bloque del iframe para busquedas embed */

#buscador2{
display: flex;
align-items: center;
justify-content: center;
}
.contenedorBuscar {
grid-column: 3 / span 2;
grid-row: 2 / span 4;
Expand All @@ -31,7 +36,8 @@ body {
}

.barraBusqueda .inputBuscador {
width: 70%;
text-align: center;
width: 60%;
margin: 10px;
padding: 10px;
border: 1px solid var(--grey-light);
Expand Down Expand Up @@ -442,12 +448,21 @@ iframe {
text-align: center;
padding: 10px;
margin: 10px;
background-color: white;
padding: 10px;
border: 0;
}

/*Modo para moviles*/
/* Media query para pantallas pequeñas */
@media screen and (max-width: 1200px) {

.btnBuscar{
font-size: 10px;
font-weight: 460;
padding: 5px;
}

.contenedor {
margin: 15px;
padding: 5px;
Expand Down Expand Up @@ -496,12 +511,12 @@ iframe {
}

.barraBusqueda .inputBuscador {
width: 70%;
width: 60%;
margin-right: 0;
padding: 10px;
border: 1px solid var(--grey-light);
outline: none;
font-size: 1.1em;
font-size: 10px;
border-radius: 30px;
}

Expand Down
4 changes: 0 additions & 4 deletions public/css/pruebas-playlist.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ CABECERA
font-family: popTextImpact, Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif;
}

.textoCabecera {
color: black;
}

.navbar a {
position: relative;
font-size: 18px;
Expand Down
8 changes: 2 additions & 6 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@

#logo {
font-size: 32px;
text-decoration: none;
/* text-decoration: none; */
font-weight: 550;
font-family: popText, Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif;
}

.textoCabecera {
color: black;
/* font-family: popText, Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif; */
}

.navbar a {
Expand Down
46 changes: 34 additions & 12 deletions public/css/usuario.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ body {

.valoraciones {
grid-area: valoraciones;
max-height: 1000px;
overflow-y: auto;
padding: 10px;
}

.valoracion {
Expand All @@ -81,11 +84,14 @@ body {
background-color: rgba(255, 255, 255, 0.211);
padding: 10px;
}
.btnsValoracion{

.btnsValoracion {
width: 100%;
margin: 0 10px;
}
.btnEditarValoracion, .btnEliminarValoracion{

.btnEditarValoracion,
.btnEliminarValoracion {
border-radius: 20px;
padding-left: 15px;
padding-right: 15px;
Expand All @@ -95,24 +101,31 @@ body {
text-align: center;
background-color: #ffffff;
}
.btnEliminarValoracion{

.btnEliminarValoracion {
background-color: #ff9497;
}
.cerrar{

.cerrar {
margin: 2% 4%;
text-align: right;
color: #0f2832;
font-weight: 500;
font-size: 1.3rem;
}
.cerrar:hover{

.cerrar:hover {
font-weight: 800;
cursor: pointer;
transition: ease-in-out 0.2s;
}

.musica {
grid-area: musica;
max-height: 1000px;
overflow-y: auto;
padding: 10px;

}

.playlists {
Expand All @@ -134,7 +147,7 @@ body {
}

#botonSolicitarAmistad,
#soisAmigos{
#soisAmigos {
border: 0;
border-radius: 10px;
margin: 15px;
Expand All @@ -143,13 +156,13 @@ body {
padding: 5px;
}

#tituloBuscarAmigos{
#tituloBuscarAmigos {
margin-top: 20px;
display: flex;
justify-content: center;
}

#buscadorUsuarios{
#buscadorUsuarios {
border: 0;
width: 60%;
text-align: center;
Expand All @@ -174,7 +187,7 @@ body {
margin: 15px;
}

.verPlaylists{
.verPlaylists {
display: flex;
background-color: rgba(255, 255, 255, 0.1);
border-radius: 20px;
Expand All @@ -183,7 +196,7 @@ body {
flex-wrap: wrap;
}

.bloquePV{
.bloquePV {
margin: 25px;
width: 30%;
}
Expand Down Expand Up @@ -242,6 +255,9 @@ body {
align-items: center;
justify-content: center;
flex-direction: column;
max-height: 400px;
overflow-y: auto;
padding: 10px;
}

.valoracion {
Expand All @@ -259,6 +275,9 @@ body {
align-items: center;
justify-content: center;
flex-direction: column;
max-height: 600px;
overflow-y: auto;
padding: 10px;
}

.playlists {
Expand All @@ -267,16 +286,19 @@ body {
align-items: center;
justify-content: center;
flex-direction: column;
max-height: 400px;
overflow-y: auto;
padding: 10px;
}

.verPlaylists{
.verPlaylists {
display: flex;
justify-content: center;
flex-direction: column;
width: 100%;
}

.bloquePV{
.bloquePV {
margin: 0;
margin-bottom: 10px;
width: 100%;
Expand Down
Loading

0 comments on commit cd15a27

Please sign in to comment.