Skip to content

2
2018_web_app
Commit 66f85bb6 by gema
Options

ajustes responsive

parent 600db0b4
Showing with 55 additions and 26 deletions
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/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">
......
fuel/app/views/menussaludables/menu/index.twig
......@@ -15,7 +15,7 @@
</div>
</div>
<div class="container mt20" >
<div class="container mt20 pb80" >
<h2 class="name-menu-saludable">Menú {{ name_menu }}</h2>
......
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
......@@ -239,6 +239,8 @@ input:checked + .slider:before {
left:10px;
padding:10px;
}
}
/*----------------------------------------------------*/
......@@ -366,6 +368,13 @@ input:checked + .slider:before {
.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;
}
}
......@@ -623,7 +632,6 @@ a:focus {
padding: 0 0 0 40px;
}
.border-box {
padding: 15px;
}
.plr0{
......@@ -632,7 +640,11 @@ a:focus {
}
}
@media (max-width:400px){
.border-box {
padding: 15px 5px 15px 5px;
}
}
/*----------------------------------------------GIF CARGA DE PAGINA----------------------*/
......@@ -993,7 +1005,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***********************************/
......
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