Skip to content

Fer #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlopez1591 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fer #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d16af7
funcion agregar bebida
fdmarzialetti Apr 1, 2023
243725c
Merge branch 'main' of https://github.com/dlopez1591/Delicatezza into…
fdmarzialetti Apr 1, 2023
24c2f25
tamaño imagenes cartas
fdmarzialetti Apr 1, 2023
5816df2
Merge branch 'main' into fer
dlopez1591 Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/resources/static/web/assets/styles/menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,12 +462,13 @@ footer{
-webkit-mask-image: linear-gradient(to right , transparent 0%, black 10%, black 50%,transparent 100%);

.card-body{

height: 100%;
}

.img-comida {
width: 100%;
height: 100%;
min-height: 15em!important;
border-radius: 0;
-webkit-mask-image: linear-gradient(to left, transparent 0%, black 10%, black 50%,transparent 100%);
}
Expand All @@ -484,6 +485,7 @@ footer{
/* navbar */
.nav-link {


text-transform: uppercase;


Expand Down
30 changes: 19 additions & 11 deletions src/main/resources/static/web/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,12 @@ <h2 class=" d-flex justify-content-center t-stroke" style="color: #ffbc00db;" da
</div>
<div class="col-md-8">
<div class="card-body d-flex flex-column justify-content-between h-100">
<h5 class="card-title">{{comida.nombre}}</h5>
<p class="card-text">{{comida.description}}</p>

<div class="d-flex flex-column">
<h5 class="card-title">{{comida.nombre}}</h5>
<p class="card-text mb-2">{{comida.description}}</p>
</div>

<div class="d-flex flex-column flex-sm-row justify-content-between align-items-center gap-4">
<div>
<h6 class="precio m-0">Precio:<span class="h4 ms-2">{{formatCurrency(comida.precio)}}</span></h6>
Expand Down Expand Up @@ -358,8 +362,10 @@ <h2 class=" d-flex justify-content-center t-stroke" style="color: #ffbc00db;" da
</div>
<div class="col-md-8">
<div class="card-body d-flex flex-column justify-content-between h-100">
<h5 class="card-title">{{comida.nombre}}</h5>
<p class="card-text">{{comida.description}}</p>
<div class="d-flex flex-column">
<h5 class="card-title">{{comida.nombre}}</h5>
<p class="card-text mb-2">{{comida.description}}</p>
</div>
<div class="d-flex flex-column flex-sm-row justify-content-between align-items-center gap-4">
<div>
<h6 class="precio m-0">Precio:<span class="h4 ms-2">{{formatCurrency(comida.precio)}}</span></h6>
Expand All @@ -375,7 +381,6 @@ <h6 class="precio m-0">Precio:<span class="h4 ms-2">{{formatCurrency(comida.prec
</article>

<!-- bebidas -->

<article id="bebidas" class="seccionComida d-flex justify-content-center flex-column align-items-center">
<h2 class=" d-flex justify-content-center t-stroke" style="color: #ffbc00db;" data-aos="fade-down-right">
Bebidas</h2>
Expand All @@ -386,14 +391,16 @@ <h2 class=" d-flex justify-content-center t-stroke" style="color: #ffbc00db;" da
</div>
<div class="col-md-8">
<div class="card-body d-flex flex-column justify-content-between h-100">
<h5 class="card-title">{{bebida.nombre}}</h5>
<p class="card-text">{{bebida.descripcion}}</p>
<div class="d-flex flex-column">
<h5 class="card-title">{{bebida.nombre}}</h5>
<p class="card-text mb-2">{{bebida.descripcion}}</p>
</div>
<div class="d-flex flex-column flex-sm-row justify-content-between align-items-center gap-4">
<div>
<h6 class="precio m-0">Precio:<span class="h4 ms-2">{{formatCurrency(bebida.precio)}}</span></h6>
</div>
<div><button type="button" class="btn btn-outline-warning btn-comida" data-bs-toggle="modal"
data-bs-target="#agregarComida" v-on:click="alertAgregar(comida)">Agregar</button>
data-bs-target="#agregarBebida" v-on:click="alertAgregar(bebida)">Agregar</button>
</div>
</div>
</div>
Expand All @@ -402,7 +409,6 @@ <h6 class="precio m-0">Precio:<span class="h4 ms-2">{{formatCurrency(bebida.prec
</div>
</article>


<!-- postre -->

<article id="postres" class="seccionComida d-flex justify-content-center flex-column align-items-center">
Expand All @@ -416,8 +422,10 @@ <h2 class=" d-flex justify-content-center t-stroke" style="color: #ffbc00db;" da
</div>
<div class="col-md-8">
<div class="card-body d-flex flex-column justify-content-between h-100">
<h5 class="card-title">{{comida.nombre}}</h5>
<p class="card-text">{{comida.description}}</p>
<div class="d-flex flex-column">
<h5 class="card-title">{{comida.nombre}}</h5>
<p class="card-text mb-2">{{comida.description}}</p>
</div>
<div class="d-flex flex-column flex-sm-row justify-content-between align-items-center gap-4">
<div>
<h6 class="precio m-0">Precio:<span class="h4 ms-2">{{formatCurrency(comida.precio)}}</span></h6>
Expand Down