Commit 5c5676f2 by Manzar Hussain

resolve conflict

parents db386de1 620a7070
...@@ -54,7 +54,29 @@ ...@@ -54,7 +54,29 @@
</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">
......
...@@ -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">
......
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