Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dic-global-dev
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Manzar Hussain
dic-global-dev
Commits
5c5676f2
Commit
5c5676f2
authored
Dec 24, 2020
by
Manzar Hussain
Browse files
Options
Browse Files
Download
Plain Diff
resolve conflict
parents
db386de1
620a7070
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
3 deletions
+25
-3
page--front.html.twig
themes/custom/envigo/templates/layout/page--front.html.twig
+24
-2
views-view-fields--latest_products--block.html.twig
themes/custom/envigo/templates/views/views-view-fields--latest_products--block.html.twig
+1
-1
No files found.
themes/custom/envigo/templates/layout/page--front.html.twig
View file @
5c5676f2
...
@@ -54,8 +54,30 @@
...
@@ -54,8 +54,30 @@
</div>
</div>
</div>
</div>
{{
page.content
}}
<div
class=
"container-fluid spacerTB"
>
<div
class=
"row"
>
<div
class=
"container"
>
<div
class=
"row"
>
{{
page.content
}}
</div>
</div>
</div>
</div>
{%
if
page.footer_top
%}
<div
class=
"container-fluid spacerTB"
>
<div
class=
"row"
>
<div
class=
"container"
>
<div
class=
"row mb-5"
>
{{
page.footer_top
}}
</div>
</div>
</div>
</div>
{%
endif
%}
{%
if
page.footer
%}
{%
if
page.footer
%}
<div
class=
"container-fluid f_l_c_b"
>
<div
class=
"container-fluid f_l_c_b"
>
<div
class=
"row"
>
<div
class=
"row"
>
...
...
themes/custom/envigo/templates/views/views-view-fields--latest_products--block.html.twig
View file @
5c5676f2
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<div
class=
"cs_item_b
col-10 col-md-3
"
>
<div
class=
"cs_item_b"
>
<div
class=
"cs_inner_item"
>
<div
class=
"cs_inner_item"
>
<div
class=
"cs_iwcb"
>
<div
class=
"cs_iwcb"
>
<a
href=
"#"
class=
"cs_img_c_b"
>
<a
href=
"#"
class=
"cs_img_c_b"
>
...
...
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