Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app

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

@@ -19,8 +19,8 @@
         {% for i in items %}
             <a href={{ "menussaludables-menu/"~ i.id }}>
                 <div class="row item-list-style">
-                    <div class="col-xs-11"> Menú {{ i.ds }}</div>
-                    <div class="col-xs-1"><i class="fa fa-angle-right"></i></div>
+                    <div class="col-xs-10"> Menú {{ i.ds }}</div>
+                    <div class="col-xs-2 text-right"><i class="fa fa-angle-right"></i></div>
                 </div>
             </a>
         {% endfor %}

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

@@ -136,11 +136,7 @@
             </div>
         </div>
 
-        <div class="row">
-            <div class="col-md-4 col-md-offset-8">
-                <button  class="btn btn-custom btn-menus-saludables mt20" ><i class="fa fa-save"></i> Guardar Selección</button>
-            </div>
-        </div>
+
 
     </div>
 

fuel/app/views/receta/content.twig

 
-<h2>{{ recipe.name }}</h2>
+<h2>{{ recipe.shortName }}</h2>
 
 <!-- imagen mas caja negra-->
 <img src="{{ recipe.image }}" class="img-responsive-custom w100pc">

public/assets/css/custom.css

@@ -470,6 +470,18 @@ a:focus {
     font-size:0.7em;
     text-transform: lowercase;
 }
+
+@media (min-width:200px) and (max-width:400px){
+    h2{
+        font-size:16px;
+    }
+}
+
+@media (min-width:401px) and (max-width:600px){
+    h2{
+        font-size:20px;
+    }
+}
 /*****************************************************************************/
 /**********************************CHECKBOX Y RADIOBUTTON CUSTOM*****************/
 /***************************************************************************************/
@@ -896,6 +908,11 @@ a:focus {
     top:0;
     right:0;
 }
+@media(max-width:500px){
+    .date-box{
+        font-size:0.8em;
+    }
+}
 
 /*****************************************************************************************************************************************/
 /*********************************************************MENÚS SALUDABLES***************************************************************/