Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into sth
Browse files Browse the repository at this point in the history
  • Loading branch information
pattiyaa committed Sep 13, 2020
2 parents 50fe691 + d6b9dce commit 441fa33
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 60 deletions.
22 changes: 11 additions & 11 deletions _includes/block.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{% case include.block.layout %}
{% when "block_image_text" %}
{% include block_image_text.html title=include.block.title paragraph=include.block.paragraph
image = include.block.image button_lable=include.block.button_lable button_url=include.block.button_url
image = include.block.image button_label=include.block.button_label button_url=include.block.button_url
fluid=0 %}
{% when "block_image_text_fluid" %}
{% include block_image_text.html title=include.block.title paragraph=include.block.paragraph
image = include.block.image button_lable=include.block.button_lable button_url=include.block.button_url
image = include.block.image button_label=include.block.button_label button_url=include.block.button_url
fluid=1 %}
{% when "block_text_image" %}
{% include block_text_image.html title=include.block.title paragraph=include.block.paragraph
image = include.block.image button_lable=include.block.button_lable button_url=include.block.button_url
image = include.block.image button_label=include.block.button_label button_url=include.block.button_url
fluid=0 %}
{% when "block_text_image_fluid" %}
{% include block_text_image.html title=include.block.title paragraph=include.block.paragraph
image = include.block.image button_lable=include.block.button_lable button_url=include.block.button_url
image = include.block.image button_label=include.block.button_label button_url=include.block.button_url
fluid=1 %}
{% when "block_text" %}
{% include block_text.html title=include.block.title paragraph=include.block.paragraph paragraph_aligh=include.block.paragraph_aligh
image = include.block.image image_size=include.block.image_size button_lable=include.block.button_lable button_url=include.block.button_url %}
{% include block_text.html title=include.block.title paragraph=include.block.paragraph paragraph_align=include.block.paragraph_align
image = include.block.image image_size=include.block.image_size button_label=include.block.button_label button_url=include.block.button_url %}
{% when "block_text_fluid" %}
{% include block_text.html title=include.block.title paragraph=include.block.paragraph paragraph_aligh=include.block.paragraph_aligh
image = include.block.image image_size=include.block.image_size button_lable=include.block.button_lable button_url=include.block.button_url
{% include block_text.html title=include.block.title paragraph=include.block.paragraph paragraph_align=include.block.paragraph_align
image = include.block.image image_size=include.block.image_size button_label=include.block.button_label button_url=include.block.button_url
fluid=1 %}
{% when "block_icon_cards" %}
{% include block_icon_cards.html header=include.block.header cards=include.block.cards card_per_line=include.block.card_per_line %}
Expand All @@ -34,15 +34,15 @@
{% include block_image_cards.html header=include.block.header cards=include.block.cards card_per_line=include.block.card_per_line %}
{% when "block_image" %}
{% include block_image.html title=include.block.title paragraph=include.block.paragraph
image = include.block.image button_lable=include.block.button_lable button_url=include.block.button_url
image = include.block.image button_label=include.block.button_label button_url=include.block.button_url
fluid=0 %}
{% when "block_image_fluid" %}
{% include block_image.html title=include.block.title paragraph=include.block.paragraph
image = include.block.image button_lable=include.block.button_lable button_url=include.block.button_url
image = include.block.image button_label=include.block.button_label button_url=include.block.button_url
fluid=1 %}
{% when "block_image_banner" %}
{% include block_image.html title=include.block.title paragraph=include.block.paragraph
image = include.block.image button_lable=include.block.button_lable button_url=include.block.button_url
image = include.block.image button_label=include.block.button_label button_url=include.block.button_url
%}
{% when "block_contactus_mascot" %}
{% include block_contactus_mascot.html form_input=include.block.form_input button_label=include.block.button_label %}
Expand Down
4 changes: 2 additions & 2 deletions _includes/block_icon_cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ <h3>{{item.title}}</h3>
{% else %}
{% assign buttonClassName = "button" %}
{% endif %}
{% if item.button_url && item.button_lable %}
{% if item.button_url && item.button_label %}
<a class="{{ buttonClassName}}"
href="{{ item.button_url }}">{{ item.button_lable }}</a>
href="{{ item.button_url }}">{{ item.button_label }}</a>
{% endif %}
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions _includes/block_image_cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2>{{include.header.title}}</h2>
divided_by: card_per %} {% assign divConClassName = "col-lg-" | append:
col %} {% else %} {% assign divConClassName = "col-lg" %} {% endif %}
<div class="col-md-6 {{ divConClassName }} mb-4 mb-lg-4">
{% if item.button_lable %}
{% if item.button_label %}
<div class="card-blog">
<img class="card-img rounded-0" src="{{item.image}}" alt="" />
<div class="card-blog-body">
Expand All @@ -24,9 +24,9 @@ <h4>{{item.title}}</h4>
{% else %}
{% assign buttonClassName = "button" %}
{% endif %}
{% if item.button_url && item.button_lable %}
{% if item.button_url && item.button_label %}
<a class="{{ buttonClassName}}" href="{{ item.button_url }}"
>{{ item.button_lable }}</a >
>{{ item.button_label }}</a >
{% endif %}
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions _includes/block_image_text.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ <h2>{{ include.title }}</h2>
{% else %}
{% assign buttonClassName = "button" %}
{% endif %}
{% if item.button_url && item.button_lable %}
<a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_lable }}</a>
{% if item.button_url && item.button_label %}
<a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_label }}</a>
{% endif %}
</div>
</div>
Expand All @@ -46,8 +46,8 @@ <h2>{{ include.title }}</h2>
{% else %}
{% assign buttonClassName = "button" %}
{% endif %}
{% if item.button_url && item.button_lable %}
<a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_lable }}</a>
{% if item.button_url && item.button_label %}
<a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_label }}</a>
{% endif %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _includes/block_text.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<img class="section-intro-img" src="{{ include.image }}" alt="" style="width:{{ include.image_size }}">
{%- endif -%}
<h2>{{ include.title }}</h2>
<p class="text-{{ include.paragraph_aligh }}">{{ include.paragraph }}</p>
<p class="text-{{ include.paragraph_align }}">{{ include.paragraph }}</p>
</div>
</div>
</section>
4 changes: 2 additions & 2 deletions _includes/block_text_cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ <h2 style="height: 80px">{{ item.title }}</h2>
{% else %}
{% assign buttonClassName = "button" %}
{% endif %}
{% if item.button_url && item.button_lable %}
{% if item.button_url && item.button_label %}
<a class="{{ buttonClassName}}"
href="{{ item.button_url }}">{{ item.button_lable }}</a>
href="{{ item.button_url }}">{{ item.button_label }}</a>
{% endif %}
</div>
{% endfor %}
Expand Down
8 changes: 4 additions & 4 deletions _includes/block_text_image.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ <h2>{{ include.title }}</h2>
{% else %}
{% assign buttonClassName = "button" %}
{% endif %}
{% if item.button_url && item.button_lable %}
<a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_lable }}</a>
{% if item.button_url && item.button_label %}
<a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_label }}</a>
{% endif %}
</div>
<div class="col-lg-6 col-md-6 mb-4 mb-md-0 ">
Expand All @@ -43,8 +43,8 @@ <h2>{{ include.title }}</h2>
{% else %}
{% assign buttonClassName = "button" %}
{% endif %}
{% if item.button_url && item.button_lable %}
<a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_lable }}</a>
{% if item.button_url && item.button_label %}
<a class="{{ buttonClassName}}" href="{{ include.button_url }}">{{ include.button_label }}</a>
{% endif %}
</div>
<div class="col-lg-6 col-md-6 mb-4 mb-md-0">
Expand Down
Loading

0 comments on commit 441fa33

Please sign in to comment.