Merge branch 'master' into dev_villa

fuel/app/views/listacompra/index.twig

@@ -25,12 +25,12 @@
                     </div>
 
                     <div class="container-box-border-box">
-                        <form>
+                        <form class="ac-custom ac-checkbox" autocomplete="off">
+                              <ul class="text-left ml0">
                                 {% for i in 0..14 %}
-                            <div class="ac-custom ac-checkbox ac-checkmark mt10" autocomplete="off">
-                                <input id="check_{{ i }}" name="check_{{ i }}" type="checkbox"><label>Ingrediente {{ i }}</label>
-                            </div>
+                                    <li> <input id="check_{{ i }}" name="check_{{ i }}" type="checkbox" checked="true"/><label for="check_{{ i }}">Ingrediente {{ i }}</label></li>
                                 {% endfor %}
+                              </ul>
                         </form>
                     </div>
                 </div>

fuel/app/views/listacompra/modal_add_product.twig

@@ -8,8 +8,8 @@
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
 
                 <div class="text-center">
-                    <i class="fa fa-shopping-cart fa-5x"></i>
-                    <h2>Añadir producto</h2>
+                    <img src="assets/img/listacompra/add_producto.png" class="img-responsive-custom"/>
+                    <h2>AÑADIR PRODUCTO</h2>
                 </div>
 
                 <div class="content pb40">

fuel/app/views/menupersonalizado/index.twig

@@ -185,16 +185,13 @@
 
                 <div class="row">
                     <div class="col-md-6 col-md-offset-6">
-                        <button  class="btn btn-custom btn-menu-personalizado-light mt20"> 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"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button>
                     </div>
                 </div>
             </div>
 
         </div>
 
-
-
-
         <div class="row">
             <div class="col-md-4 col-md-offset-8">
                 <button  class="btn btn-custom btn-menu-personalizado mt20" ><i class="fa fa-save"></i> Guardar Selección</button>
@@ -203,6 +200,10 @@
 
     </div>
 
+    <!--modal recomendaciones resto del día-->
+    {% include 'modal_resto_dia.twig' %}
+
+
 {% endblock %}
 
 

fuel/app/views/menupersonalizado/modal_resto_dia.twig

+
+<!-- Modal info template -->
+<div class="modal fade" id="modalRecomendaciones" tabindex="-1" role="dialog" aria-labelledby="modalRecomendaciones">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+
+            <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"/>
+                    <h2>RECOMENDACIONES</h2>
+                </div>
+
+                <div class="content text-center pb40">
+                   Texto recomendaciones de comidas para el menú
+                </div>
+
+            </div>
+
+        </div>
+    </div>
+</div>
\ No newline at end of file

fuel/app/views/menussaludables/menu/index.twig

@@ -176,7 +176,7 @@
                         </div>
                         <div class="row">
                             <div class="col-md-6 col-md-offset-6">
-                                <button  class="btn btn-custom btn-menus-saludables-light mt20"> 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"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button>
                             </div>
                         </div>
                     </div>
@@ -192,6 +192,10 @@
 
     </div>
 
+    <!--modal recomendaciones resto del día-->
+    {% include 'modal_resto_dia.twig' %}
+
+
 {% endblock %}
 
 

fuel/app/views/menussaludables/menu/modal_resto_dia.twig

+
+<!-- Modal info template -->
+<div class="modal fade" id="modalRecomendaciones" tabindex="-1" role="dialog" aria-labelledby="modalRecomendaciones">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+
+            <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"/>
+                    <h2>RECOMENDACIONES</h2>
+                </div>
+
+                <div class="content text-center pb40">
+                    Texto recomendaciones resto del día
+                </div>
+
+            </div>
+
+        </div>
+    </div>
+</div>
\ No newline at end of file

fuel/app/views/receta/content.twig

@@ -2,7 +2,7 @@
 <h2>{{ recipe.name }}</h2>
 
 <!-- imagen mas caja negra-->
-<img src="{{ recipe.image }}" class="img-responsive-custom">
+<img src="{{ recipe.image }}" class="img-responsive-custom w100pc">
 <div class="solid-box bg-color-other mt0">
     <div class="row ">
         {#tiempo de receta#}
@@ -11,7 +11,7 @@
             {{ recipe.time }} min
         </div>
         {#dificultad de recdeta#}
-        <div class="col-md-6">
+        <div class="col-md-6 text-right">
             <i class="fa fa-star-o"></i> Dificultad:
             {{ recipe.difficulty }}
         </div>