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

Jump to bottom

会員登録完了ページ等　本文とボタンの横幅（グリッド）の修正 #5255

Merged
merged 1 commit into from
Jun 3, 2022
Merged

会員登録完了ページ等　本文とボタンの横幅（グリッド）の修正 #5255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/Eccube/Resource/template/default/Contact/complete.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ file that was distributed with this source code.
</div>
</div>
<div class="ec-contactCompleteRole">
<div class="ec-reportHeading">
<h2>{{ 'front.contact.complete_message__title'|trans }}</h2>
</div>
<div class="ec-off3Grid ec-text-ac">
<div class="ec-off3Grid__cell">
<div class="ec-reportHeading">
<h2>{{ 'front.contact.complete_message__title'|trans }}</h2>
</div>
<p class="ec-reportDescription">{{ 'front.contact.complete_message__body'|trans }}</p>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{'common.go_to_top'|trans}}</a></div>
</div>
</div>
</div>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{'common.go_to_top'|trans}}</a></div>
</div>
</div>
{% endblock %}
23 changes: 12 additions & 11 deletions src/Eccube/Resource/template/default/Entry/activate.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,21 @@ file that was distributed with this source code.
</div>
</div>
<div class="ec-registerCompleteRole">
<div class="ec-reportHeading">
<h2>{{ 'front.entry.complete_message__title'|trans }}</h2>
</div>
<div class="ec-off3Grid ec-text-ac">
<div class="ec-off3Grid__cell">
<div class="ec-reportHeading">
<h2>{{ 'front.entry.complete_message__title'|trans }}</h2>
</div>
<p class="ec-reportDescription">{{ 'front.entry.complete_message__activated'|trans|nl2br }}</p>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell">
{% if qtyInCart %}
<a class="ec-blockBtn--action" style="margin-bottom: 3px" href="{{ url('cart') }}">{{ 'common.go_to_cart'|trans }}</a>
{% endif %}
<a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'common.go_to_top'|trans }}</a>
</div>
</div>

</div>
</div>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell">
{% if qtyInCart %}
<a class="ec-blockBtn--action" style="margin-bottom: 3px" href="{{ url('cart') }}">{{ 'common.go_to_cart'|trans }}</a>
{% endif %}
<a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'common.go_to_top'|trans }}</a>
</div>
</div>
</div>
Expand Down
14 changes: 8 additions & 6 deletions src/Eccube/Resource/template/default/Entry/complete.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,18 @@ file that was distributed with this source code.
</div>
</div>
<div class="ec-registerCompleteRole">
<div class="ec-reportHeading">
<h2>{{ 'front.entry.complete_message__title'|trans }}</h2>
</div>
<div class="ec-off3Grid ec-text-ac">
<div class="ec-off3Grid__cell">
<div class="ec-reportHeading">
<h2>{{ 'front.entry.complete_message__title'|trans }}</h2>
</div>

<p class="ec-reportDescription">{{ 'front.entry.complete_message__temporary'|trans|nl2br }}</p>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'common.go_to_top'|trans }}</a></div>
</div>

</div>
</div>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'common.go_to_top'|trans }}</a></div>
</div>
</div>
{% endblock %}
16 changes: 8 additions & 8 deletions src/Eccube/Resource/template/default/Mypage/change_complete.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ file that was distributed with this source code.
{% include 'Mypage/navi.twig' %}
</div>
<div class="ec-registerCompleteRole">
<div class="ec-reportHeading">
<h2>{{ 'front.mypage.customer_complete_message__title'|trans }}</h2>
</div>
<div class="ec-off2Grid ec-text-ac">
<div class="ec-off2Grid__cell">
<div class="ec-reportHeading">
<h2>{{ 'front.mypage.customer_complete_message__title'|trans }}</h2>
</div>
<p class="ec-reportDescription">{{ 'front.mypage.customer_complete_message__body'|trans }}</p>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--cancel"
href="{{ url('homepage') }}">{{ 'common.back'|trans }}</a>
</div>
</div>
</div>
</div>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell">
<a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'common.back'|trans }}</a>
</div>
</div>
</div>
Expand Down
15 changes: 9 additions & 6 deletions src/Eccube/Resource/template/default/Mypage/withdraw_complete.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@ file that was distributed with this source code.
</div>
<div class="ec-mypageRole">
<div class="ec-withdrawCompleteRole">
<div class="ec-reportHeading">
<h2>{{ 'front.mypage.withdraw_complete_message__title'|trans }}</h2>
</div>
<div class="ec-off3Grid ec-text-ac">
<div class="ec-off3Grid__cell">
<p class="ec-reportDescription">{{ 'front.mypage.withdraw_complete_message__body'|trans|nl2br }}</p>
</div>
</div>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell">
<div class="ec-reportHeading">
<h2>{{ 'front.mypage.withdraw_complete_message__title'|trans }}</h2>
</div>
<p class="ec-reportDescription">{{ 'front.mypage.withdraw_complete_message__body'|trans|nl2br }}</p>
<p><a href="{{ url('homepage') }}"
class="ec-blockBtn--cancel">{{ 'common.go_to_top'|trans }}</a></p>
<a href="{{ url('homepage') }}" class="ec-blockBtn--cancel">{{ 'common.go_to_top'|trans }}</a>
</div>
</div>
</div>
Expand Down
22 changes: 10 additions & 12 deletions src/Eccube/Resource/template/default/Shopping/complete.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,28 @@ file that was distributed with this source code.
</div>

<div class="ec-cartCompleteRole">
<div class="ec-reportHeading">
<h2>{{ 'front.shopping.complete_message__title'|trans }}</h2>
</div>
<div class="ec-off3Grid ec-text-ac">
<div class="ec-off3Grid__cell">
<div class="ec-reportHeading">
<h2>{{ 'front.shopping.complete_message__title'|trans }}</h2>
</div>
<p class="ec-reportDescription">
{{ 'front.shopping.complete_message__body'|trans|nl2br }}
{% if Order.id %}
<br /><br /><strong>{{ 'front.shopping.order_no'|trans }} : {{ Order.orderNo }}</strong>
{% endif %}
</p>

{% if Order.complete_message is not empty %}
{{ Order.complete_message|raw }}
{% endif %}

<div class="ec-off4Grid">
{% if hasNextCart %}
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--primary" href="{{ url('cart') }}">{{ 'front.shopping.continue'|trans }}</a></div>
{% else %}
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'common.go_to_top'|trans }}</a></div>
{% endif %}
</div>
</div>
</div>
<div class="ec-off4Grid">
{% if hasNextCart %}
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--primary" href="{{ url('cart') }}">{{ 'front.shopping.continue'|trans }}</a></div>
{% else %}
<div class="ec-off4Grid__cell"><a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'common.go_to_top'|trans }}</a></div>
{% endif %}
</div>
</div>
{% endblock %}