Skip to content

2
2018_web_app
Commit 0d6e04c5 by David Villalba
Options

Merge branch 'master' into dev_villa

parents 846b36c6 9fda1425
Showing with 407 additions and 288 deletions
fuel/app/classes/controller/listacompra/index.php
......@@ -22,7 +22,12 @@ class Controller_Listacompra_Index extends \Controller_App{
public function before()
{
$recipes = Model_Recipe::get_recipes_current_week();
//Se cargan funciones de javascript especificas de esta funcionalidad
Casset::js('listacompra/index.js');
$recipes = Model_Recipe::get_recipes_current_week();
//PEDIR INGREDIENTES
//Recorremos las recetas para obtener los ingredientes.
......
fuel/app/classes/controller/recetario/index.php
......@@ -14,7 +14,11 @@ use Auth\Auth;
class Controller_Recetario_Index extends \Controller_App{
public function before(){
//Se cargan funciones de javascript especificas de esta funcionalidad
Casset::js('recetario/index.js');
parent::before();
}
public function get_index(){
......
fuel/app/config/routes.php
......@@ -54,6 +54,7 @@ return array(
'lista-compra' => 'listacompra/index',
'lista-compra/delete_all' => 'listacompra/index/delete_all',
'lista-compra/delete' => 'listacompra/index/delete_ingredients',
......
fuel/app/views/layout/template.twig
......@@ -34,15 +34,16 @@
<div class="cs-loader">
<div class="cs-loader-logo" >
<img src="assets/img/logos/inutralia.png" class="img-responsive-custom">
<div class="cs-loader-inner">
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
</div>
</div>
<div class="cs-loader-inner">
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
</div>
</div>
<!--menú vertical y horizontal-->
{% include 'layout/menu.twig' %}
......
fuel/app/views/layout/template_dashboard.twig
......@@ -34,15 +34,16 @@
<div class="cs-loader">
<div class="cs-loader-logo" >
<img src="assets/img/logos/inutralia.png" class="img-responsive-custom">
<div class="cs-loader-inner">
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
</div>
</div>
<div class="cs-loader-inner">
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
</div>
</div>
<!--menú vertical y horizontal-->
......
fuel/app/views/listacompra/index.twig
......@@ -25,16 +25,18 @@
</div>
<div class="container-box-border-box">
<form class="ac-custom ac-checkbox" autocomplete="off">
<ul class="text-left ml0">
{% if count(ingredients) == 0 %}
<h4>Sin Ingredientes</h4>
{% endif %}
{% for i in ingredients %}
<li> <input id="check_{{ i.id }}" name="check_{{ i.id }}" type="checkbox" checked="true"/><label for="check_{{ i.id }}">{{ i.desc }}</label></li>
{% endfor %}
</ul>
</form>
<div class="div-scrollable-lista">
<form class="ac-custom ac-checkmark" autocomplete="off">
<ul class="text-left ml0">
{% if count(ingredients) == 0 %}
<h4>Sin Ingredientes</h4>
{% endif %}
{% for i in ingredients %}
<li> <input id="check_{{ i.id }}" name="check_{{ i.id }}" type="checkbox" rel="{{ i.id }}"/><label for="check_{{ i.id }}">{{ i.desc }}</label></li>
{% endfor %}
</ul>
</form>
</div>
</div>
</div>
</div>
......@@ -42,10 +44,10 @@
<h3 class="mt40" >Puedes editar tu lista de la compra borrando y añadiendo productos.</h3>
<!--botones-->
<div class="row ">
<div class="col-md-6">
<div class="col-xs-6">
<button class="btn btn-custom btn-delete mt20" data-toggle="modal" data-target="#modalDelete" ><i class="fa fa-trash"></i> Todos</button>
</div>
<div class="col-md-6">
<div class="col-xs-6">
<button class="btn btn-custom btn-delete mt20" data-toggle="modal" data-target="#modalDelete"><i class="fa fa-trash"></i> Marcados</button>
</div>
</div>
......
fuel/app/views/listacompra/modal_add_product.twig
......@@ -8,13 +8,14 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center">
<img src="assets/img/listacompra/add_producto.png" class="img-responsive-custom"/>
<img src="assets/img/listacompra/add_producto.png" class="img-responsive-custom mt40"/>
<h2>AÑADIR PRODUCTO</h2>
<p>Los productos que añadas manualmente no se enviarán a DelSuper en el caso de que elijas esta opción de compra.</p>
</div>
<div class="content pb40">
<div class="content pb40 mt40">
<form>
<p>Producto</p>
<label>Producto</label>
<input type="text" class="form-control" name="product" id="product" value=""/>
<div class="mt20">
......
fuel/app/views/listacompra/modal_delete.twig
......@@ -7,7 +7,7 @@
<div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center">
<img src="assets/img/listacompra/delete.png" class="img-responsive-custom"/>
<img src="assets/img/listacompra/delete.png" class="img-responsive-custom mt40"/>
</div>
<h2 class="text-center">¿BORRAR?</h2>
......@@ -20,7 +20,7 @@
<button type="button" class="btn btn-custom btn-other" data-dismiss="modal">Cancelar</button>
</div>
<div class="col-md-6">
<button type="button" class="btn btn-custom btn-danger">Sí, borrarlos</button>
<button type="button" class="btn btn-custom btn-danger btn-delete-checked">Sí, borrarlos</button>
</div>
</div>
</div>
......
fuel/app/views/listacompra/modal_delete_all.twig
......@@ -7,7 +7,7 @@
<div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center">
<img src="assets/img/listacompra/delete.png" class="img-responsive-custom"/>
<img src="assets/img/listacompra/delete.png" class="img-responsive-custom mt40"/>
</div>
<h2 class="text-center">¿BORRAR?</h2>
......
fuel/app/views/menupersonalizado/index.twig
......@@ -15,7 +15,7 @@
</div>
</div>
<div class="container mt20" >
<div class="container mt20 pb80" >
<div id="exTab2" class="container">
<ul class="nav nav-tabs nav-tabs-menu-personalizado">
......@@ -69,7 +69,7 @@
data-option="lunchFirst">
<label for="{{ day.lunchFirst[0].id }}">{{ day.lunchFirst[0].name }}</label>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
......@@ -87,7 +87,7 @@
<label for="{{ day.lunchFirst[1].id }}">{{ day.lunchFirst[1].name }}</label>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
......@@ -116,7 +116,7 @@
<label for="{{ day.lunchSecond[0].id }}">{{ day.lunchSecond[0].name }}</label>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
......@@ -134,7 +134,7 @@
<label for="{{ day.lunchSecond[1].id }}">{{ day.lunchSecond[1].name }}</label>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
......@@ -167,7 +167,7 @@
<label for="{{ day.dinnerFirst[0].id }}">{{ day.dinnerFirst[0].name }}</label>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
......@@ -185,7 +185,7 @@
<label for="{{ day.dinnerFirst[1].id }}">{{ day.dinnerFirst[1].name }}</label>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
......@@ -214,7 +214,7 @@
<label for="{{ day.dinnerSecond[0].id }}">{{ day.dinnerSecond[0].name }}</label>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
......@@ -232,7 +232,7 @@
<label for="{{ day.dinnerSecond[1].id }}">{{ day.dinnerSecond[1].name }}</label>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
......@@ -248,7 +248,7 @@
<div class="row">
<div class="col-md-6 col-md-offset-6">
<button class="btn btn-custom btn-menu-personalizado-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button>
<button class="btn btn-custom btn-menu-personalizado-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Resto del día <i class="fa fa-angle-double-right"></i> </button>
</div>
</div>
</div>
......
fuel/app/views/menupersonalizado/modal_resto_dia.twig
......@@ -7,7 +7,7 @@
<div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center">
<img src="assets/img/menu_personalizado/recomendaciones.png" class="img-responsive-custom"/>
<img src="assets/img/menu_personalizado/recomendaciones.png" class="img-responsive-custom mt40"/>
<h2>RECOMENDACIONES</h2>
</div>
......
fuel/app/views/menussaludables/menu/index.twig
......@@ -8,14 +8,14 @@
<div class="col-xs-10 col-sm-11">
{{ title }}
</div>
<div class="col-xs-2 col-sm-1 text-right" data-toggle="tooltip" data-placement="bottom" title="¿Como funciona?">
<div class="col-xs-2 col-sm-1 text-right" data-toggle="tooltip-info" data-placement="bottom" title="¿Como funciona?">
<i class="fa fa-info-circle" data-toggle="modal" data-target="#modalInfo"></i>
</div>
</div>
</div>
</div>
<div class="container mt20" >
<div class="container mt20 pb80" >
<h2 class="name-menu-saludable">Menú {{ name_menu }}</h2>
......@@ -55,12 +55,12 @@
PRIMER PLATO
</div>
<div class="container-box-border-box plr-recipe-generales">
<a href={{ "receta-detalle/update/" ~ i.lunchFirst[0].id }}>
<a href={{ "receta-detalle/update/" ~ i.lunchFirst[0].id }} data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<div class="row pointer a-black">
<div class="col-xs-11 plr0">
<p class="color-other">{{ i.lunchFirst[0].name }}</p>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" >
<i class="fa fa-search"></i>
</div>
</div>
......@@ -72,12 +72,12 @@
SEGUNDO PLATO
</div>
<div class="container-box-border-box plr-recipe-generales">
<a href={{ "receta-detalle/update/"~ i.lunchSecond[0].id }}>
<a href={{ "receta-detalle/update/"~ i.lunchSecond[0].id }} data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<div class="row pointer a-black">
<div class="col-xs-11 plr0">
<p class="color-other">{{ i.lunchSecond[0].name }}</p>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" >
<i class="fa fa-search "></i>
</div>
</div>
......@@ -95,12 +95,12 @@
</div>
<div class="container-box-border-box plr-recipe-generales">
<a href={{ "receta-detalle/update/"~ i.dinnerFirst[0].id }}>
<a href={{ "receta-detalle/update/"~ i.dinnerFirst[0].id }} data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<div class="row pointer a-black">
<div class="col-xs-11 plr0">
<p class="color-other" >{{ i.dinnerFirst[0].name }}</p>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" >
<i class="fa fa-search "></i>
</div>
</div>
......@@ -112,12 +112,12 @@
SEGUNDO PLATO
</div>
<div class="container-box-border-box plr-recipe-generales">
<a href={{ "receta-detalle/update/"~ i.dinnerSecond[0].id }}>
<a href={{ "receta-detalle/update/"~ i.dinnerSecond[0].id }} data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<div class="row pointer a-black">
<div class="col-xs-11 plr0">
<p class="color-other" > {{ i.dinnerSecond[0].name }} </p>
</div>
<div class="col-xs-1 plr0">
<div class="col-xs-1 plr0" >
<i class="fa fa-search "></i>
</div>
</div>
......@@ -128,7 +128,7 @@
</div>
<div class="row">
<div class="col-md-6 col-md-offset-6">
<button class="btn btn-custom btn-menus-saludables-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button>
<button class="btn btn-custom btn-menus-saludables-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Resto del día <i class="fa fa-angle-double-right"></i> </button>
</div>
</div>
</div>
......
fuel/app/views/menussaludables/menu/modal_resto_dia.twig
......@@ -7,7 +7,7 @@
<div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center">
<img src="assets/img/menus_saludables/recomendaciones.png" class="img-responsive-custom"/>
<img src="assets/img/menus_saludables/recomendaciones.png" class="img-responsive-custom mt40"/>
<h2>RECOMENDACIONES</h2>
</div>
......
fuel/app/views/modals/modal_saved.twig
......@@ -7,7 +7,7 @@
<div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center">
<img src="assets/img/save.png" class="img-responsive-custom"/>
<img src="assets/img/save.png" class="img-responsive-custom mt40"/>
</div>
<div class="content text-center pb40">
......
fuel/app/views/receta/content.twig
<h2>{{ recipe.shortName }}</h2>
<h2><strong>{{ recipe.shortName }}</strong></h2>
<!-- imagen mas caja negra-->
<img src="{{ recipe.image }}" class="img-responsive-custom w100pc">
<div class="solid-box bg-color-other mt0">
<div class="row ">
{#tiempo de receta#}
<div class="col-md-6">
<div class="col-xs-5">
<i class="fa fa-clock-o"></i>
{{ recipe.time }} min
</div>
{#dificultad de recdeta#}
<div class="col-md-6 text-right">
<div class="col-xs-7 text-right">
<i class="fa fa-star-o"></i> Dificultad:
{{ recipe.difficulty }}
</div>
......
fuel/app/views/receta/tables.twig
......@@ -5,11 +5,11 @@
Ingredientes (4 personas)
</div>
<div class="container-box-border-box">
<div class="container-box-border-box text-tables-recipe">
{% for i in recipe.ingredients %}
<div class="row antirow mt10">
<div class="col-md-8"> {{ i.name }}</div>
<div class="col-md-4 text-right">{{ i.cuantity }}</div>
<div class="col-xs-8"> {{ i.name }}</div>
<div class="col-xs-4 text-right">{{ i.cuantity }}</div>
</div>
{% endfor %}
</div>
......@@ -22,30 +22,30 @@
Información Nutricional por Ración
</div>
<div class="container-box-border-box">
<div class="container-box-border-box text-tables-recipe">
<div class="row antirow mt10">
<div class="col-md-7">Energía </div>
<div class="col-md-5 text-right">{{ recipe.energy }}</div>
<div class="col-xs-7">Energía </div>
<div class="col-xs-5 text-right">{{ recipe.energy }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Proteína </div>
<div class="col-md-5 text-right">{{ recipe.protein }}</div>
<div class="col-xs-7">Proteína </div>
<div class="col-xs-5 text-right">{{ recipe.protein }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Carbohidratos</div>
<div class="col-md-5 text-right">{{ recipe.carbohydrates }}</div>
<div class="col-xs-7">Carbohidratos</div>
<div class="col-xs-5 text-right">{{ recipe.carbohydrates }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Lípidos</div>
<div class="col-md-5 text-right">{{ recipe.lipids }}</div>
<div class="col-xs-7">Lípidos</div>
<div class="col-xs-5 text-right">{{ recipe.lipids }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Fibra</div>
<div class="col-md-5 text-right">{{ recipe.fiber }}</div>
<div class="col-xs-7">Fibra</div>
<div class="col-xs-5 text-right">{{ recipe.fiber }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Colesterol</div>
<div class="col-md-5 text-right">{{ recipe.cholesterol }}</div>
<div class="col-xs-7">Colesterol</div>
<div class="col-xs-5 text-right">{{ recipe.cholesterol }}</div>
</div>
</div>
</div>
\ No newline at end of file
fuel/app/views/recetario/index.twig
......@@ -15,7 +15,7 @@
</div>
</div>
<!--contenido-->
<div class="container mt20">
<div class="container mt20 pb80">
<div>
{% include 'filters.twig' %}
</div>
......
public/assets/css/custom.css
......@@ -233,6 +233,14 @@ input:checked + .slider:before {
margin-top:40px;
}
@media (max-width:375px){
.title-box-border-box{
font-size:0.8em;
left:10px;
padding:10px;
}
}
/*----------------------------------------------------*/
/*--------------BOTONES CORPORATIVOS------------------*/
/*-------------------------------------------------------*/
......@@ -245,11 +253,10 @@ input:checked + .slider:before {
@media(max-width:600px){
.btn-custom{
font-size:16px;
}
}
.btn i{
font-size:20px!important;
}
......@@ -269,9 +276,9 @@ input:checked + .slider:before {
.btn-delete{background-color: #c83737}
/*----------------------------------------------------*/
/*-------------------------------------------------------------------------------------------------------------------------------------------------------------*/
/*------------TABS PERSONALIZADOS, PARA MENÚS CON COLORES CORPORATIVOS. PARA LA TAB DEL MENÚ PERSONALIZADO Y PARA LAS DE LOS MENÚS SALUDABLES------------------*/
/*-------------------------------------------------------*/
/*--------------------------------------------------------------------------------------------------------------------------------------------------------------*/
.nav-tabs-menu-personalizado>li.active>a, .nav-tabs-menu-personalizado>li.active>a:focus, .nav-tabs-menu-personalizado>li.active>a:hover {
color: #fff;
......@@ -332,20 +339,60 @@ input:checked + .slider:before {
@media (max-width:600px){
.nav-tabs-menus-saludables>li>a, .nav-tabs-menus-saludables>li>a:focus, .nav-tabs-menus-saludables>li>a:hover {
font-size:10px;
}
.nav-tabs-menus-saludables>li.active>a, .nav-tabs-menus-saludables>li.active>a:focus, .nav-tabs-menus-saludables>li.active>a:hover {
font-size:10px;
}
.nav-tabs-menu-personalizado>li a,.nav-tabs-menu-personalizado>li a:hover, .nav-tabs-menu-personalizado>li a:focus, .nav-tabs-menu-personalizado>li a:active{
font-size:10px;
}
.nav>li>a {
position: relative;
display: block;
padding: 10px 8px;
}
}
@media (max-width:374px){
.nav-tabs-menus-saludables>li>a, .nav-tabs-menus-saludables>li>a:focus, .nav-tabs-menus-saludables>li>a:hover {
font-size:8px;
}
.nav-tabs-menus-saludables>li.active>a, .nav-tabs-menus-saludables>li.active>a:focus, .nav-tabs-menus-saludables>li.active>a:hover {
font-size:8px;
font-size:8px;
}
.nav-tabs-menu-personalizado>li a,.nav-tabs-menu-personalizado>li a:hover, .nav-tabs-menu-personalizado>li a:focus, .nav-tabs-menu-personalizado>li a:active{
font-size:8px;
}
.tab-content-menus-saludables{
padding:10px;
}
.tab-content-menu-persoanlizado{
padding:10px;
}
}
/*----------------------------------------------------*/
/*-------------TEXTOS, PADINGS, MARGINS------------------*/
/*-------------------------------------------------------*/
@media (max-width:320px){
.nav-tabs-menus-saludables>li>a, .nav-tabs-menus-saludables>li>a:focus, .nav-tabs-menus-saludables>li>a:hover {
font-size:5px;
}
.nav-tabs-menus-saludables>li.active>a, .nav-tabs-menus-saludables>li.active>a:focus, .nav-tabs-menus-saludables>li.active>a:hover {
font-size:5px;
}
.nav-tabs-menu-personalizado>li a,.nav-tabs-menu-personalizado>li a:hover, .nav-tabs-menu-personalizado>li a:focus, .nav-tabs-menu-personalizado>li a:active{
font-size:5px;
}
}
/*-------------------------------------------------------------------------------*/
/*---------------------------------TEXTOS, PADINGS, MARGINS----------------------*/
/*------------------------------------------------------------------------------*/
h1{
font-size:2.5em!important;
......@@ -482,14 +529,14 @@ a:focus {
font-size:20px;
}
}
/*****************************************************************************/
/**********************************CHECKBOX Y RADIOBUTTON CUSTOM*****************/
/***************************************************************************************/
/**********************************CHECKBOX Y RADIOBUTTON CUSTOM************************/
/***************************************************************************************/
.ac-custom {
padding: 0 2em;
max-width:100%;
}
.ac-custom label {
display: inline-block;
position: relative;
......@@ -536,7 +583,7 @@ a:focus {
.ac-custom input[type="radio"]:checked + label::before {
opacity: 0.8;
}
/*trazado radio button*/
/*******************trazado radio button******/
.ac-custom svg path {
stroke: #92bb00;
stroke-width: 13px;
......@@ -578,10 +625,28 @@ a:focus {
margin: 0 auto;
}
.ac-custom label {
font-size: 0.8em;
padding: 0 0 0 40px;
}
.border-box {
padding: 15px;
}
.plr0{
padding-left:5px;
padding-right:5px;
}
}
@media (max-width:400px){
.border-box {
padding: 15px 5px 15px 5px;
}
}
/******************************************************************************************/
/*----------------------------------------------GIF CARGA DE PAGINA----------------------*/
/******************************************************************************************/
.cs-loader {
z-index: 9999;
......@@ -592,25 +657,18 @@ a:focus {
left: 0;
height:100vh;
width: 100%;
display:flex;
align-items:center;
justify-content:center;
}
.cs-loader-logo {
position:absolute;
margin-left: auto;
margin-right: auto;
left: 0;
right: 0;
text-align:center;
top:250px;
}
.cs-loader-inner {
transform: translateY(-50%);
top: 350px;
/*position: absolute;*/
margin-top:40px;
width: calc(100% - 200px);
color: #C966CD;
padding: 0 100px;
......@@ -699,19 +757,143 @@ a:focus {
/**********************************************************************************************************************************/
/*********************************************LOGIN***********************************************************************************/
/*.box-login {*/
/*position: absolute;*/
/*left: 50%;*/
/*top: 50%;*/
/*transform: translate(-50%, -50%);*/
/*width: 30%;*/
/*height: 60%;*/
/*padding: 20px;*/
/*text-align: center;*/
/*box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);*/
/*}*/
/****************************************************************************************************************************************/
@media (max-width:639px){
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 100%;
height: 60%;
padding: 10px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 640px) and (max-width: 736px) {
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width:737px) and (max-width: 991px){
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 50%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media(min-width: 992px)and (max-width: 1199px){
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 50%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1199px)and (max-width: 1367px) {
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1368px)and (max-width: 1598px) {
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 50%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1599px)and (max-width: 1599px) {
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1600px)and (max-width: 1930px) {
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height:45%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1935px) {
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 40%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-MAIN MENU HORIZONTAL NAVBAR*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
......@@ -745,8 +927,9 @@ a:focus {
font-size:18px;
}
}
/**********************************************************************************************************************/
/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-DASHBOARD, HOME*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
/**********************************************************************************************************************/
.text-btn-home{
color:#fff;
}
......@@ -759,7 +942,6 @@ a:focus {
animation: bounce 1s;
/*transition: all 0.3s ease-in-out;*/
/*transform: scale(0.8);*/
}
.btn-home:hover {
......@@ -849,8 +1031,9 @@ a:focus {
}
}
/*----------------------------------------*/
/*----------------------------------------------------------------*/
/*----------CUADRÍCULA CUADRADOS MISMA ALTURA HOME--------------*/
/******************************************************************/
.col-container {
display: table;
......@@ -871,8 +1054,9 @@ a:focus {
}
}
/*************************************************************************************************************************/
/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-FILTROS RECETARIO*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
/******************************************************************************************************************************/
.mt-arrow-filters{
margin-top:-40px;
......@@ -901,8 +1085,9 @@ a:focus {
position: relative;
z-index: 9;
}
/****************************************************************************************************************************************/
/****************************************************LISTADO DE ARTICULOS***************************************************************/
/******************************************************************************************************************************************/
.date-box{
position:absolute;
top:0;
......@@ -914,6 +1099,19 @@ a:focus {
}
}
/****************************************************LISTA DE LA COMPRA***************************************************************/
/*******************************************************************************************************************************************/
.div-scrollable-lista{
overflow-y: scroll;
height:400px;
}
@media (min-width:1600px){
.div-scrollable-lista{
overflow-y: scroll;
height:500px;
}
}
/*****************************************************************************************************************************************/
/*********************************************************MENÚS SALUDABLES***************************************************************/
/****************************************************************************************************************************************/
......@@ -940,7 +1138,19 @@ a:focus {
font-size:15px;
}
}
/*****************************************************************************************************************************************/
/*********************************************************RECIPE***************************************************************/
/****************************************************************************************************************************************/
@media (max-width:500px){
.text-tables-recipe div{
font-size:0.9em;
}
}
@media (max-width:375px){
.text-tables-recipe div{
font-size:0.8em;
}
}
/****************************************************************************************************/
/**********************************MODALS***********************************/
......@@ -956,169 +1166,3 @@ a:focus {
}
}
/*-*-*-*---*-*-*--*-*-*--*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*RESPONSIVE-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*---*-*-*-*-*-*/
/***_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_vertical iphone 3, 4, 5 **_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_*/
/*@media (width: 320px) {*/
@media (min-width: 318px) and (max-width: 329px) {
}
/*v**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_vertical androids peques**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_*/
@media (min-width: 330px) and (max-width: 374px) {
}
/***_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_horizontal iphone 3, 4, 5 **_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_*/
@media (min-width: 479px) and (max-width: 569px) {
}
/***_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_vertical iphone 6 u 6plis **_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_*/
@media (min-width: 374px) and (max-width: 639px) {
}
@media (max-width:639px){
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 100%;
height: 60%;
padding: 10px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
/**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_horizontal iphone 6 y 6plus **_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_*/
@media (min-width: 640px) and (max-width: 736px) {
/*********************************************LOGIN***********************************************************************************/
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
/***_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_ Small devices (tablets, 768px and up) **_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_*/
@media (min-width:737px) and (max-width: 991px){
/*********************************************LOGIN***********************************************************************************/
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 50%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
/***_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_ ipad 3/4 horizontal 1024x 768**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_*/
@media(min-width: 992px)and (max-width: 1199px){
/*********************************************LOGIN***********************************************************************************/
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 50%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
/***_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_ po típico 1366x768**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_**_*_ */
@media (min-width: 1199px)and (max-width: 1367px) {
/*********************************************LOGIN***********************************************************************************/
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1368px)and (max-width: 1598px) {
/*********************************************LOGIN***********************************************************************************/
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 50%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1599px)and (max-width: 1599px) {
/*********************************************LOGIN***********************************************************************************/
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 60%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1600px)and (max-width: 1930px) {
/*********************************************LOGIN***********************************************************************************/
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height:45%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
@media (min-width: 1935px) {
/*********************************************LOGIN***********************************************************************************/
.box-login {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30%;
height: 40%;
padding: 20px;
text-align: center;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
}
}
public/assets/js/listacompra/index.js 0 → 100644
var ids =[];
$(document).ready(function() {
$(':input:checked').each(function () {
ids += $(this).attr('rel');
})
$('.btn-lista-compra').on('click', function (e) {
get_checkeds();
window.location.href = 'http://www.delsuper.es/inutralia?ids='+ids.toString()
})
$('.btn-delete-checked').on('click', function (e) {
get_checkeds();
$.ajax({
url: "listacompra/delete",
type: "POST",
method:"post",
data: {
id: $('#profile_id').val(),
inputs: inputs
},
success: function (data) {
if(data != "" && data != 0){
// Modal success
$('#modalSuccess').modal('show');
}else{
// Modal error
}
setTimeout(function(){
location.reload();
}, 2000);
}
})
})
});
function get_checkeds()
{
$(':input:checked').each(function () {
let id_val = $(this).attr('rel');
if( jQuery.inArray(id_val, ids)<0)
{
ids.push(id_val);
}
});
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment