Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

デザイン調整 #150

Merged
merged 2 commits into from
Jul 1, 2022
Merged

デザイン調整 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55b3e4d
デザイン調整
chihiro-adachi Jul 1, 2022
4405587
バージョンの更新
chihiro-adachi Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Resource/template/admin/index.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</a>
</td>
<td>
<a class="" data-toggle="modal" data-target="#confirmModal-{{ Coupon.id }}" data-tooltip="tooltip" data-placement="top" title="{{ 'common.label.delete'|trans }}">
<a class="" data-bs-toggle="modal" data-bs-target="#confirmModal-{{ Coupon.id }}" data-bs-tooltip="tooltip" data-bs-placement="top" title="{{ 'common.delete'|trans }}">
<i class="fa fa-close fa-lg text-secondary"></i>
</a>

Expand All @@ -97,16 +97,15 @@
<div class="modal-header">
<h5 class="modal-title font-weight-bold">
{{ 'plugin_coupon.admin.index.delete.confirm'|trans }}</h5>
<button class="close" type="button" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
</button>
<button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body text-left">
<p class="text-left">
{{ 'plugin_coupon.admin.index.delete.confirm'|trans }}</p>
</div>
<div class="modal-footer">
<button class="btn btn-ec-sub" type="button"
data-dismiss="modal">{{ 'common.cancel'|trans }}
data-bs-dismiss="modal">{{ 'common.cancel'|trans }}
</button>
<a href="{{ url('plugin_coupon_delete', {'id' : Coupon.id}) }}" class="btn btn-ec-delete" data-confirm="false" {{ csrf_token_for_anchor() }} data-method="delete">
{{ 'common.delete'|trans }}
Expand Down
2 changes: 1 addition & 1 deletion Resource/template/admin/order_edit_coupon.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<span class="card-title">{{ 'plugin_coupon.admin.order_edit.header'|trans }}</span>
</div>
</div>
<div class="col-4 text-right"><a data-toggle="collapse" href="#couponArea" aria-expanded="false" aria-controls="couponArea"><i class="fa fa-angle-up fa-lg"></i></a></div>
<div class="col-4 text-end"><a data-bs-toggle="collapse" href="#couponArea" aria-expanded="false" aria-controls="couponArea"><i class="fa fa-angle-up fa-lg"></i></a></div>
</div>
</div>
<div class="collapse show ec-cardCollapse" id="couponArea">
Expand Down
22 changes: 9 additions & 13 deletions Resource/template/admin/regist.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@
<span class="card-title">{{ 'plugin_coupon.admin.regist.header.product'|trans }}</span>
</div>
</div>
<div class="col-4 text-right">
<a data-toggle="collapse" href="#productArea" aria-expanded="false" aria-controls="productArea">
<div class="col-4 text-end">
<a data-bs-toggle="collapse" href="#productArea" aria-expanded="false" aria-controls="productArea">
<i class="fa fa-angle-up fa-lg"></i>
</a>
</div>
Expand All @@ -388,7 +388,7 @@
<div class="collapse show ec-cardCollapse" id="productArea">
<div class="card-body">
<div class="text-center">
<a id="showSearchProductModal" class="btn btn-ec-regular mr-2 add" data-toggle="modal" data-target="#searchProductModal">商品の追加</a>
<a id="showSearchProductModal" class="btn btn-ec-regular mr-2 add" data-bs-toggle="modal" data-bs-target="#searchProductModal">商品の追加</a>
</div>
<div class="tableish" id="coupon_detail_list" data-prototype="{{ include('Coupon42/Resource/template/admin/regist_product_list_prototype.twig') }}">
{% set i = 0 %}
Expand Down Expand Up @@ -434,8 +434,8 @@
<span class="card-title">{{ 'plugin_coupon.admin.regist.header.category'|trans }}</span>
</div>
</div>
<div class="col-4 text-right">
<a data-toggle="collapse" href="#categoryArea" aria-expanded="false" aria-controls="category_area">
<div class="col-4 text-end">
<a data-bs-toggle="collapse" href="#categoryArea" aria-expanded="false" aria-controls="category_area">
<i class="fa fa-angle-up fa-lg"></i>
</a>
</div>
Expand All @@ -445,7 +445,7 @@
<div class="collapse show ec-cardCollapse" style="display: block;" id="categoryArea">
<div class="card-body">
<div class="text-center">
<a id="showSearchCategoryModal" class="btn btn-ec-regular mr-2 add" data-toggle="modal" data-target="#searchCategoryModal">カテゴリの追加</a>
<a id="showSearchCategoryModal" class="btn btn-ec-regular mr-2 add" data-bs-toggle="modal" data-bs-target="#searchCategoryModal">カテゴリの追加</a>
</div>
<div class="tableish"
id="coupon_detail_list2"
Expand Down Expand Up @@ -501,7 +501,7 @@
<div class="col-6">
<div class="row align-items-center justify-content-end">
<div class="col-auto">
<button type="submit" class="btn btn-primary btn-block btn-lg">{{ 'common.registration'|trans }}</button>
<button type="submit" class="btn btn-ec-conversion">{{ 'common.registration'|trans }}</button>
</div>
</div>
</div>
Expand All @@ -522,9 +522,7 @@
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="searchProductModalLabel">{{ 'plugin_coupon.admin.regist.modal.product'|trans }}</h4>
<button class="close" type="button" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="form-group">
Expand Down Expand Up @@ -552,9 +550,7 @@
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="searchCategoryModalLabel">{{ 'plugin_coupon.admin.regist.modal.category'|trans }}</h4>
<button class="close" type="button" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion Resource/template/admin/search_category.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</td>
<td>
</td>
<td class="text-right">
<td class="text-end">
<button onclick="fnAddCategoryDetail($(this).parent().parent(), {{ id }}, '{{ name|escape('js') }}')" type="button" class="btn btn-default btn-sm">
{{ 'common.ok'|trans }}
</button>
Expand Down
2 changes: 1 addition & 1 deletion Resource/template/admin/search_product.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
{% endif %}
</span>
</td>
<td class="text-right">
<td class="text-end">
<button onclick="fnAddProductDetail($(this).parent().parent(), {{ Product.id }}, '{{ Product.name|escape('js') }}')" type="button" class="btn btn-default btn-sm">
{{ 'common.ok'|trans }}
</button>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ec-cube/coupon42",
"version": "4.2.0",
"version": "4.2.1",
"description": "Coupon Plugin for EC-CUBE42",
"type": "eccube-plugin",
"extra": {
Expand Down