お問合せフォームの郵便番号のエラーメッセージが2つ表示されるバグ修正

EC-CUBE · Aug 16, 2022 · 9e4a62c · 9e4a62c
1 parent 8f02333
commit 9e4a62c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/html/template/default/assets/css/style.css b/html/template/default/assets/css/style.css
diff --git a/html/template/default/assets/css/style.css.map b/html/template/default/assets/css/style.css.map
diff --git a/html/template/default/assets/css/style.min.css b/html/template/default/assets/css/style.min.css
diff --git a/html/template/default/assets/css/style.min.css.map b/html/template/default/assets/css/style.min.css.map
diff --git a/html/template/default/assets/scss/project/_19.2.contact.scss b/html/template/default/assets/scss/project/_19.2.contact.scss
@@ -18,10 +18,6 @@ Styleguide 19.2
   & &__actions {
     padding-top:20px;
   }
-  p {
-    margin:16px 0;
-  }
-
 }
 .ec-contactConfirmRole {
   @include container;

diff --git a/src/Eccube/Resource/template/default/Contact/index.twig b/src/Eccube/Resource/template/default/Contact/index.twig
@@ -63,16 +63,15 @@ file that was distributed with this source code.
                                 <div class="ec-zipInput{{ has_errors(form.postal_code) ? ' error' }}">
                                     <span>{{ 'common.postal_symbol'|trans }}</span>
                                     {{ form_widget(form.postal_code) }}
-                                    {{ form_errors(form.postal_code) }}
-                                </div>
-                                <div class="ec-zipInputHelp">
-                                    <div class="ec-zipInputHelp__icon">
-                                        <div class="ec-icon"><img
+                                    <div class="ec-zipInputHelp">
+                                        <div class="ec-zipInputHelp__icon">
+                                            <div class="ec-icon"><img
                                                     src="{{ asset('assets/icon/question-white.svg') }}" alt="">
-                                        </div>
-                                    </div><a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
+                                            </div>
+                                        </div><a href="https://www.post.japanpost.jp/zipcode/" target="_blank"><span>{{ 'common.search_postal_code'|trans }}</span></a>
+                                    </div>
+                                    {{ form_errors(form.postal_code) }}
                                 </div>
-                                {{ form_errors(form.postal_code) }}
                                 <div class="ec-select{{ has_errors(form.address.pref) ? ' error' }}">
                                     {{ form_widget(form.address.pref) }}
                                     {{ form_errors(form.address.pref) }}