From f79de9ae8c41d91cd5f57c945b12b44ae7f3c71b Mon Sep 17 00:00:00 2001 From: tatsuishi Date: Thu, 22 Feb 2024 21:00:31 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88=E5=81=B4?= =?UTF-8?q?=E3=82=A2=E3=83=A9=E3=83=BC=E3=83=88=E3=83=A1=E3=83=83=E3=82=BB?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=8C=E9=95=B7=E3=81=84=E5=A0=B4=E5=90=88?= =?UTF-8?q?=E3=81=AE=E5=B4=A9=E3=82=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- codeception/acceptance/EF03OrderCest.php | 2 +- html/template/default/assets/css/style.css | 10 +++ .../assets/scss/project/_15.1.cart.scss | 11 ++++ .../Resource/template/default/Cart/index.twig | 64 +++++++++++++------ .../template/default/Shopping/alert.twig | 22 +++++-- .../template/default/Shopping/shipping.twig | 20 ++++-- 6 files changed, 95 insertions(+), 34 deletions(-) diff --git a/codeception/acceptance/EF03OrderCest.php b/codeception/acceptance/EF03OrderCest.php index b2952fd2943..2a112118ad9 100644 --- a/codeception/acceptance/EF03OrderCest.php +++ b/codeception/acceptance/EF03OrderCest.php @@ -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) diff --git a/html/template/default/assets/css/style.css b/html/template/default/assets/css/style.css index 7dcbe0f0559..7693e8e535a 100755 --- a/html/template/default/assets/css/style.css +++ b/html/template/default/assets/css/style.css @@ -13076,6 +13076,14 @@ Styleguide 15.1.6 background: #F99; margin-bottom: 20px; } +.ec-alert-warning .ec-alert-warning__inner { + display: inline-block; +} +.ec-alert-warning .ec-alert-warning__inner__item { + display: flex; + flex-wrap: wrap; + justify-content: center; +} .ec-alert-warning .ec-alert-warning__icon { display: inline-block; margin-right: 1rem; @@ -13091,6 +13099,8 @@ Styleguide 15.1.6 font-weight: bold; color: #fff; position: relative; + flex: 1; + word-break: break-all; } /* アラート(空) diff --git a/html/template/default/assets/scss/project/_15.1.cart.scss b/html/template/default/assets/scss/project/_15.1.cart.scss index e4ee31c3df2..e62c67481d1 100644 --- a/html/template/default/assets/scss/project/_15.1.cart.scss +++ b/html/template/default/assets/scss/project/_15.1.cart.scss @@ -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; @@ -423,6 +432,8 @@ Styleguide 15.1.6 font-weight: bold; color: #fff; position: relative; + flex: 1; + word-break: break-all; } } diff --git a/src/Eccube/Resource/template/default/Cart/index.twig b/src/Eccube/Resource/template/default/Cart/index.twig index 67613f2b424..f22623f64a1 100644 --- a/src/Eccube/Resource/template/default/Cart/index.twig +++ b/src/Eccube/Resource/template/default/Cart/index.twig @@ -63,13 +63,17 @@ file that was distributed with this source code. {% set idx = loop.index0 %}
-
-
- {% if productStr[idx] is defined %} - {{ error|trans({'%product%':productStr[idx]})|nl2br }} - {% else %} - {{ error|trans|nl2br }} - {% endif %} +
+
+
+
+ {% if productStr[idx] is defined %} + {{ error|trans({'%product%':productStr[idx]})|nl2br }} + {% else %} + {{ error|trans|nl2br }} + {% endif %} +
+
@@ -77,9 +81,13 @@ file that was distributed with this source code. {% for error in app.session.flashbag.get('eccube.front.cart.error') %}
-
-
- {{ error|trans|nl2br }} +
+
+
+
+ {{ error|trans|nl2br }} +
+
@@ -93,8 +101,12 @@ file that was distributed with this source code. {% if Carts|length > 1 %}
-
- {{ 'front.cart.divide_cart'|trans|nl2br }} +
+
+
+ {{ 'front.cart.divide_cart'|trans|nl2br }} +
+
@@ -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') %}
-
-
- {{ error|trans|nl2br }} +
+
+
+
+ {{ error|trans|nl2br }} +
+
@@ -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') %}
-
-
- {{ error|trans|nl2br }} +
+
+
+
+ {{ error|trans|nl2br }} +
+
@@ -229,8 +249,12 @@ file that was distributed with this source code.
-
-
{{ 'front.cart.no_items'|trans }}
+
+
+
+
{{ 'front.cart.no_items'|trans }}
+
+
diff --git a/src/Eccube/Resource/template/default/Shopping/alert.twig b/src/Eccube/Resource/template/default/Shopping/alert.twig index 8f936ec603d..e72f59e34b6 100644 --- a/src/Eccube/Resource/template/default/Shopping/alert.twig +++ b/src/Eccube/Resource/template/default/Shopping/alert.twig @@ -4,9 +4,13 @@ {% for error in app.session.flashbag.get('eccube.front.error') %}
-
-
- {{ error|trans|nl2br }} +
+
+
+
+ {{ error|trans|nl2br }} +
+
@@ -15,10 +19,14 @@ {% for error in app.session.flashbag.get('eccube.front.warning') %}
-
-
-
- {{ error|trans|nl2br }} +
+
+
+
+
+ {{ error|trans|nl2br }} +
+
diff --git a/src/Eccube/Resource/template/default/Shopping/shipping.twig b/src/Eccube/Resource/template/default/Shopping/shipping.twig index b89df461adf..2304257d728 100644 --- a/src/Eccube/Resource/template/default/Shopping/shipping.twig +++ b/src/Eccube/Resource/template/default/Shopping/shipping.twig @@ -25,17 +25,25 @@ file that was distributed with this source code.
{{ 'front.shopping.shipping_add_new_shipping'|trans }}
{% else %}
-
-
- {{ 'common.customer_address_count_is_over'|trans({ '%count%': eccube_config.eccube_deliv_addr_max }) }} +
+
+
+
+ {{ 'common.customer_address_count_is_over'|trans({ '%count%': eccube_config.eccube_deliv_addr_max }) }} +
+
{% endif %} {% if has_errors(form.addresses) %}
-
-
- {{ 'front.shopping.shipping_unselected'|trans }} +
+
+
+
+ {{ 'front.shopping.shipping_unselected'|trans }} +
+
{% endif %}