Skip to content

Commit

Permalink
Merge pull request #17 from eccubevn/vn-fix-break-font-awsome
Browse files Browse the repository at this point in the history 
Fix break font at some text using font awesome
  • Loading branch information
@ndquocphong
ndquocphong authored Jan 16, 2019
2 parents 9731cd8 + 5e4a2c2 commit 3c7b61b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
5 changes: 2 additions & 3 deletions app/template/admin/Order/index.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,8 @@ file that was distributed with this source code.
</div>
<div class="d-inline-block mb-3 collapsed" data-toggle="collapse" href="#searchDetail" aria-expanded="false" aria-controls="searchDetail">
<a>
<i class="fa font-weight-bold mr-1 fa-plus-square-o">
<span class="font-weight-bold">{{ 'admin.common.search_detail'|trans }}</span>
</i>
<i class="fa font-weight-bold mr-1 fa-plus-square-o"></i>
<span class="font-weight-bold">{{ 'admin.common.search_detail'|trans }}</span>
</a>
</div>
</div>
Expand Down
14 changes: 7 additions & 7 deletions app/template/admin/Setting/Shop/csv.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,21 +116,21 @@ file that was distributed with this source code.
<div class="row mb-2">
<div class="col text-center">
<div class="btn btn-ec-regular btn-block" id="remove"><i class="fa fa-arrow-left"
aria-hidden="true"><span>&nbsp;{{ 'admin.setting.shop.csv.operation__release'|trans }}</span></i>
aria-hidden="true"></i><span>&nbsp;{{ 'admin.setting.shop.csv.operation__release'|trans }}</span>
</div>
</div>
</div>
<div class="row mb-2">
<div class="col text-center">
<div class="btn btn-ec-regular btn-block" id="add-all"><i
class="fa fa-arrow-circle-right" aria-hidden="true"><span>&nbsp;{{ 'admin.setting.shop.csv.operation__all_output'|trans }}</span></i>
class="fa fa-arrow-circle-right" aria-hidden="true"></i><span>&nbsp;{{ 'admin.setting.shop.csv.operation__all_output'|trans }}</span>
</div>
</div>
</div>
<div class="row mb-2">
<div class="col text-center">
<div class="btn btn-ec-regular btn-block" id="remove-all"><i class="fa fa-arrow-circle-left"
aria-hidden="true"><span>&nbsp;{{ 'admin.setting.shop.csv.operation__all_release'|trans }}</span></i>
aria-hidden="true"></i><span>&nbsp;{{ 'admin.setting.shop.csv.operation__all_release'|trans }}</span>
</div>
</div>
</div>
Expand All @@ -148,28 +148,28 @@ file that was distributed with this source code.
<div class="row mb-2">
<div class="col text-center">
<div class="btn btn-ec-regular btn-block move" data-value="up"><i class="fa fa-arrow-up"
aria-hidden="true"><span>&nbsp;{{ 'admin.setting.shop.csv.order__up'|trans }}</span></i>
aria-hidden="true"></i><span>&nbsp;{{ 'admin.setting.shop.csv.order__up'|trans }}</span>
</div>
</div>
</div>
<div class="row mb-2">
<div class="col text-center">
<div class="btn btn-ec-regular btn-block move" data-value="down"><i class="fa fa-arrow-down"
aria-hidden="true"><span>&nbsp;{{ 'admin.setting.shop.csv.order__down'|trans }}</span></i>
aria-hidden="true"></i><span>&nbsp;{{ 'admin.setting.shop.csv.order__down'|trans }}</span>
</div>
</div>
</div>
<div class="row mb-2">
<div class="col text-center">
<div class="btn btn-ec-regular btn-block move-most" data-value="top"><i class="fa fa-arrow-circle-up"
aria-hidden="true"><span>&nbsp;{{ 'admin.setting.shop.csv.order__top'|trans }}</span></i>
aria-hidden="true"></i><span>&nbsp;{{ 'admin.setting.shop.csv.order__top'|trans }}</span>
</div>
</div>
</div>
<div class="row mb-2">
<div class="col text-center">
<div class="btn btn-ec-regular btn-block move-most" data-value="bottom"><i class="fa fa-arrow-circle-down"
aria-hidden="true"><span>&nbsp;{{ 'admin.setting.shop.csv.order__bottom'|trans }}</span></i>
aria-hidden="true"></i><span>&nbsp;{{ 'admin.setting.shop.csv.order__bottom'|trans }}</span>
</div>
</div>
</div>
Expand Down

0 comments on commit 3c7b61b

Please sign in to comment.