Merge pull request #5462 from chihiro-adachi/umebius/dev/entry_styles

新規会員登録のスタイル修正
EC-CUBE · Aug 1, 2022 · 5e78c76 · 5e78c76
2 parents 105498f + 2da5039
commit 5e78c76
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 28 deletions.
diff --git a/html/template/default/assets/css/style.css b/html/template/default/assets/css/style.css
@@ -12294,7 +12294,12 @@ Styleguide 3.1.2
   width: 47%;
   margin-left: 2%;
 }
-.ec-halfInput input[type=text]:first-child {
+.ec-halfInput .ec-errorMessage {
+  display: inline-block;
+  width: 47%;
+}
+.ec-halfInput input[type=text]:first-of-type,
+.ec-halfInput .ec-errorMessage:first-of-type {
   margin-left: 0;
 }
 /*
@@ -12350,7 +12355,7 @@ Styleguide 3.1.4
   display: inline-block;
   text-align: left;
   width: auto;
-  max-width: 8em;
+  max-width: 9em;
   font-size: 16px;
 }
 .ec-zipInput span {
@@ -12411,7 +12416,7 @@ Markup:
 Styleguide 3.1.5
 */
 .ec-telInput input {
-  max-width: 10em;
+  max-width: 12em;
   text-align: left;
 }
 /**
@@ -12676,7 +12681,12 @@ Styleguide 3.1.2
   width: 47%;
   margin-left: 2%;
 }
-.ec-halfInput input[type=text]:first-child {
+.ec-halfInput .ec-errorMessage {
+  display: inline-block;
+  width: 47%;
+}
+.ec-halfInput input[type=text]:first-of-type,
+.ec-halfInput .ec-errorMessage:first-of-type {
   margin-left: 0;
 }
 /*
@@ -12732,7 +12742,7 @@ Styleguide 3.1.4
   display: inline-block;
   text-align: left;
   width: auto;
-  max-width: 8em;
+  max-width: 9em;
   font-size: 16px;
 }
 .ec-zipInput span {
@@ -12793,7 +12803,7 @@ Markup:
 Styleguide 3.1.5
 */
 .ec-telInput input {
-  max-width: 10em;
+  max-width: 12em;
   text-align: left;
 }
 /*
@@ -29780,6 +29790,10 @@ Styleguide 22.1
     margin-left: 15px;
     width: 45%;
   }
+  .ec-halfInput .ec-errorMessage {
+    margin-left: 15px;
+    width: 45%;
+  }
   .ec-input input, .ec-birth input, .ec-select input, .ec-halfInput input, .ec-numberInput input, .ec-zipInput input, .ec-telInput input {
     font-size: 14;
   }
@@ -29796,6 +29810,10 @@ Styleguide 22.1
     margin-left: 15px;
     width: 45%;
   }
+  .ec-halfInput .ec-errorMessage {
+    margin-left: 15px;
+    width: 45%;
+  }
   .ec-select__delivery {
     display: inline-block;
   }
@@ -30552,9 +30570,6 @@ Styleguide 22.1
   .ec-historyListHeader .ec-historyListHeader__action a {
     font-size: 14px;
   }
-  .ec-registerRole .ec-registerRole__actions {
-    text-align: left;
-  }
   .ec-customerRole .ec-blockBtn--action {
     margin-bottom: 16px;
   }

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/component/_3.1.inputText.scss b/html/template/default/assets/scss/component/_3.1.inputText.scss
@@ -108,8 +108,19 @@ Styleguide 3.1.2
       width: 45%;
     }
   }
-  input[type='text']:first-child{
-    margin-left: 0;
+  .ec-errorMessage {
+    display: inline-block;
+    width: 47%;
+    @include media_desktop {
+      margin-left: 15px;
+      width: 45%;
+    }
+  }
+  input[type='text'],
+  .ec-errorMessage {
+    &:first-of-type {
+      margin-left: 0;
+    }
   }
 }
 
@@ -167,9 +178,9 @@ Styleguide 3.1.4
   display: inline-block;
   input{
     display: inline-block;
-        text-align: left;
+    text-align: left;
     width: auto;
-        max-width: 8em;
+    max-width: 9em;
     font-size: 16px;
   }
   span{
@@ -233,7 +244,7 @@ Styleguide 3.1.5
 .ec-telInput{
   @extend .ec-input;
   input {
-    max-width: 10em;
+    max-width: 12em;
     text-align: left;
   }
 }
diff --git a/html/template/default/assets/scss/project/_19.1.register.scss b/html/template/default/assets/scss/project/_19.1.register.scss
@@ -18,9 +18,6 @@ Styleguide 19.1
   & &__actions {
     padding-top:20px;
     text-align: center;
-    @include media_desktop {
-      text-align: left;
-    }
     p {
       margin-bottom: 16px;
     }

diff --git a/src/Eccube/Resource/template/default/Entry/index.twig b/src/Eccube/Resource/template/default/Entry/index.twig
@@ -200,15 +200,15 @@ file that was distributed with this source code.
                         {% endfor %}
                     </div>
                     <div class="ec-registerRole__actions">
+                        <div class="ec-checkbox{{ has_errors(form.user_policy_check) ? ' error' }}">
+                            <label>
+                                {{ form_widget(form.user_policy_check) }}
+                                {{ 'front.entry.agree_with_terms'|trans({ '%url%': url('help_agreement') })|raw }}
+                            </label>
+                            {{ form_errors(form.user_policy_check) }}
+                        </div>
                         <div class="ec-off4Grid">
                             <div class="ec-off4Grid__cell">
-                                <div class="ec-checkbox{{ has_errors(form.user_policy_check) ? ' error' }}">
-                                    <label>
-                                        {{ form_widget(form.user_policy_check) }}
-                                        {{ 'front.entry.agree_with_terms'|trans({ '%url%': url('help_agreement') })|raw }}
-                                    </label>
-                                    {{ form_errors(form.user_policy_check) }}
-                                </div>
                                 <button class="ec-blockBtn--action" type="submit" name="mode" value="confirm">{{ 'front.entry.agree'|trans }}</button>
                                 <a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'front.entry.disagree'|trans }}</a>
                             </div>