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

フロント側アラートメッセージが長い場合の崩れ修正 #6102

Merged
merged 1 commit into from
Mar 4, 2024
+95 −34
Merged

フロント側アラートメッセージが長い場合の崩れ修正 #6102

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
2 changes: 1 addition & 1 deletion codeception/acceptance/EF03OrderCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ public function order_複数配送設定画面での販売制限エラー(Accept

ShoppingPage::at($I);

$I->see('「チェリーアイスサンド」の在庫が不足しております。一度に在庫数を超える購入はできません。', 'div:nth-child(2) > div > div.ec-alert-warning__text');
$I->see('「チェリーアイスサンド」の在庫が不足しております。一度に在庫数を超える購入はできません。', 'div:nth-child(2) > div > div> div > div.ec-alert-warning__text');
}

public function order_複数ブラウザでログインしてカートに追加する(AcceptanceTester $I)
Expand Down
10 changes: 10 additions & 0 deletions html/template/default/assets/css/style.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions html/template/default/assets/scss/project/_15.1.cart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,15 @@ Styleguide 15.1.6
background: #F99;
margin-bottom: 20px;

& &__inner {
display: inline-block;

&__item {
display: flex;
flex-wrap: wrap;
justify-content: center;
}
}

& &__icon {
display: inline-block;
Expand All @@ -423,6 +432,8 @@ Styleguide 15.1.6
font-weight: bold;
color: #fff;
position: relative;
flex: 1;
word-break: break-all;
}
}

Expand Down
64 changes: 44 additions & 20 deletions src/Eccube/Resource/template/default/Cart/index.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,31 @@ file that was distributed with this source code.
{% set idx = loop.index0 %}
<div class="ec-cartRole__error">
<div class="ec-alert-warning">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{% if productStr[idx] is defined %}
{{ error|trans({'%product%':productStr[idx]})|nl2br }}
{% else %}
{{ error|trans|nl2br }}
{% endif %}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{% if productStr[idx] is defined %}
{{ error|trans({'%product%':productStr[idx]})|nl2br }}
{% else %}
{{ error|trans|nl2br }}
{% endif %}
</div>
</div>
</div>
</div>
</div>
{% endfor %}
{% for error in app.session.flashbag.get('eccube.front.cart.error') %}
<div class="ec-cartRole__error">
<div class="ec-alert-warning">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
</div>
</div>
</div>
</div>
</div>
Expand All @@ -93,8 +101,12 @@ file that was distributed with this source code.
{% if Carts|length > 1 %}
<div class="ec-cartRole__error">
<div class="ec-alert-warning">
<div class="ec-alert-warning__text">
{{ 'front.cart.divide_cart'|trans|nl2br }}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__text">
{{ 'front.cart.divide_cart'|trans|nl2br }}
</div>
</div>
</div>
</div>
</div>
Expand All @@ -107,9 +119,13 @@ file that was distributed with this source code.
{% for error in app.session.flashbag.get('eccube.front.cart.' ~ cartKey ~ '.request.error') %}
<div class="ec-cartRole__error">
<div class="ec-alert-warning">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
</div>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -217,9 +233,13 @@ file that was distributed with this source code.
{% for error in app.session.flashbag.get('eccube.front.cart.' ~ cartKey ~ '.request.error') %}
<div class="ec-cartRole__error">
<div class="ec-alert-warning">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
</div>
</div>
</div>
</div>
</div>
Expand All @@ -229,8 +249,12 @@ file that was distributed with this source code.
<div class="ec-off3Grid">
<div class="ec-off3Grid__cell">
<div class="ec-alert-warning">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">{{ 'front.cart.no_items'|trans }}</div>
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">{{ 'front.cart.no_items'|trans }}</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
22 changes: 15 additions & 7 deletions src/Eccube/Resource/template/default/Shopping/alert.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
{% for error in app.session.flashbag.get('eccube.front.error') %}
<div class="ec-cartRole__error">
<div class="ec-alert-warning">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"></div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
</div>
</div>
</div>
</div>
</div>
Expand All @@ -15,10 +19,14 @@
{% for error in app.session.flashbag.get('eccube.front.warning') %}
<div class="ec-cartRole__error">
<div class="ec-alert-warning">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}">
</div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}">
</div>
<div class="ec-alert-warning__text">
{{ error|trans|nl2br }}
</div>
</div>
</div>
</div>
</div>
Expand Down
20 changes: 14 additions & 6 deletions src/Eccube/Resource/template/default/Shopping/shipping.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,25 @@ file that was distributed with this source code.
<div class="ec-addressRole__actions"><a class="ec-inlineBtn" href="{{ url('shopping_shipping_edit', {'id': shippingId}) }}">{{ 'front.shopping.shipping_add_new_shipping'|trans }}</a></div>
{% else %}
<div class="ec-alert-warning">
<div class="ec-alert-warning__text">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"/></div>
{{ 'common.customer_address_count_is_over'|trans({ '%count%': eccube_config.eccube_deliv_addr_max }) }}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"/></div>
<div class="ec-alert-warning__text">
{{ 'common.customer_address_count_is_over'|trans({ '%count%': eccube_config.eccube_deliv_addr_max }) }}
</div>
</div>
</div>
</div>
{% endif %}
{% if has_errors(form.addresses) %}
<div class="ec-alert-warning">
<div class="ec-alert-warning__text">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"/></div>
{{ 'front.shopping.shipping_unselected'|trans }}
<div class="ec-alert-warning__inner">
<div class="ec-alert-warning__inner__item">
<div class="ec-alert-warning__icon"><img src="{{ asset('assets/icon/exclamation-white.svg') }}"/></div>
<div class="ec-alert-warning__text">
{{ 'front.shopping.shipping_unselected'|trans }}
</div>
</div>
</div>
</div>
{% endif %}
Expand Down
Loading