Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
2
2018_web_app
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
inutralia
2018_web_app
Commits
3389b22f
Commit
3389b22f
authored
Dec 03, 2018
by
gema
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avance en recetario , añadida route que había borrado sin querer a receta detalle
parent
1d2b5a67
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
8 deletions
+51
-8
routes.php
fuel/app/config/routes.php
+2
-0
menu.twig
fuel/app/views/layout/menu.twig
+0
-0
filters.twig
fuel/app/views/recetario/filters.twig
+8
-4
index.twig
fuel/app/views/recetario/index.twig
+6
-2
list.twig
fuel/app/views/recetario/list.twig
+15
-2
custom.css
public/assets/css/custom.css
+20
-0
No files found.
fuel/app/config/routes.php
View file @
3389b22f
...
@@ -31,6 +31,8 @@ return array(
...
@@ -31,6 +31,8 @@ return array(
'menussaludables'
=>
'menussaludables/lista/index'
,
'menussaludables'
=>
'menussaludables/lista/index'
,
'menussaludables-menu'
=>
'menussaludables/menu/index'
,
'menussaludables-menu'
=>
'menussaludables/menu/index'
,
'receta-detalle'
=>
'receta/index'
,
'recetario'
=>
'recetario/index'
,
'recetario'
=>
'recetario/index'
,
...
...
fuel/app/views/layout/menu.twig
View file @
3389b22f
fuel/app/views/recetario/filters.twig
View file @
3389b22f
...
@@ -4,16 +4,19 @@
...
@@ -4,16 +4,19 @@
</div>
</div>
<div
class=
"container-box-border-box"
>
<div
class=
"container-box-border-box"
>
<div
id=
"btn-show-filter-recetario"
class=
"text-right mt-arrow-filters "
>
<!--flecha desplegable filtros-->
<div
id=
"btn-show-filter-recetario"
class=
"text-right mt-arrow-filters pointer"
>
<i
class=
"fa fa-angle-down fa-2x"
id=
"arrow-filters"
>
</i>
<i
class=
"fa fa-angle-down fa-2x"
id=
"arrow-filters"
>
</i>
</div>
</div>
<!--contenido desplegable filtros-->
<div
class=
"hidden"
id=
"content-filter-recetario"
>
<div
class=
"hidden"
id=
"content-filter-recetario"
>
<div
class=
"row mt20"
>
<div
class=
"row mt20"
>
{%
for
i
in
0.
.
11
%}
{%
for
i
in
1.
.
12
%}
<div
class=
"col-md-4"
>
<div
class=
"col-md-4"
>
<div
class=
"form-group text-center"
>
<div
class=
"form-group text-center"
>
<label
class=
"switch"
for=
"checkbox
_
{{
i
}}
"
>
<label
class=
"switch"
for=
"switch_filter
_
{{
i
}}
"
>
<input
type=
"checkbox"
id=
"checkbox
_
{{
i
}}
"
/>
<input
type=
"checkbox"
id=
"switch_filter
_
{{
i
}}
"
/>
<div
class=
"slider round"
></div>
<div
class=
"slider round"
></div>
</label>
</label>
<p>
filtro
{{
i
}}
</p>
<p>
filtro
{{
i
}}
</p>
...
@@ -27,6 +30,7 @@
...
@@ -27,6 +30,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
fuel/app/views/recetario/index.twig
View file @
3389b22f
...
@@ -8,11 +8,15 @@
...
@@ -8,11 +8,15 @@
</div>
</div>
</div>
</div>
<!--contenido-->
<!--contenido-->
<div
class=
"container mt20"
>
<div
class=
"container mt20"
>
<div>
{%
include
'filters.twig'
%}
{%
include
'filters.twig'
%}
</div>
<div>
{%
include
'list.twig'
%}
{%
include
'list.twig'
%}
</div>
</div>
</div>
{%
endblock
%}
{%
endblock
%}
...
...
fuel/app/views/recetario/list.twig
View file @
3389b22f
listado
{%
for
i
in
0.
.
11
%}
\ No newline at end of file
<!--item lista, una receta-->
<div
class=
"receta-and-articulo-item-list pointer"
style=
"background-image:url('assets/img/receta/receta.jpg')"
>
<a
href=
"receta-detalle"
>
<div
class=
"black-overlay"
>
<div
class=
"text-receta-and-articulo-item-list"
>
<h2><b>
Titulo receta
</b></h2>
<p>
Frase especial de receta
</p>
</div>
</div>
</a>
</div>
{%
endfor
%}
\ No newline at end of file
public/assets/css/custom.css
View file @
3389b22f
...
@@ -520,6 +520,26 @@ a:focus {
...
@@ -520,6 +520,26 @@ a:focus {
margin-top
:
-40px
;
margin-top
:
-40px
;
}
}
.receta-and-articulo-item-list
{
background-size
:
cover
;
height
:
200px
;
width
:
100%
;
}
.text-receta-and-articulo-item-list
{
color
:
#fff
;
}
.black-overlay
{
background-color
:
rgba
(
0
,
0
,
0
,
0.5
);
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
position
:
relative
;
z-index
:
9
;
}
/*-*-*-*---*-*-*--*-*-*--*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*RESPONSIVE-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*---*-*-*-*-*-*/
/*-*-*-*---*-*-*--*-*-*--*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*RESPONSIVE-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*---*-*-*-*-*-*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment