Merge branch 'master' of http://47.99.244.21:9999/root/joshine

app/code/Magento/Customer/view/frontend/templates/widget/name.phtml

@@ -24,6 +24,7 @@ $prefix = $block->showPrefix();
 $middle = $block->showMiddlename();
 $middle = $block->showMiddlename();
 $suffix = $block->showSuffix();
 $suffix = $block->showSuffix();
 ?>
 ?>
+
 <?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()) : ?>
 <?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()) : ?>
 <div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
 <div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
     <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
     <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
@@ -64,6 +65,7 @@ $suffix = $block->showSuffix();
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
                        value="<?= $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
                        value="<?= $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
                        title="<?= $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
                        title="<?= $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
+                       maxlength="20"
                        class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?= ($block->getAttributeValidationClass('firstname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
                        class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?= ($block->getAttributeValidationClass('firstname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
             </div>
             </div>
         </div>
         </div>
@@ -87,6 +89,7 @@ $suffix = $block->showSuffix();
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
                        value="<?= $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
                        value="<?= $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
                        title="<?= $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
                        title="<?= $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
+                       maxlength="20"
                        class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?= ($block->getAttributeValidationClass('lastname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
                        class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?= ($block->getAttributeValidationClass('lastname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
             </div>
             </div>
         </div>
         </div>

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml

@@ -100,7 +100,7 @@
         transition: all 0.4s ease;
         transition: all 0.4s ease;
         -webkit-transition: all 0.4s ease;
         -webkit-transition: all 0.4s ease;
     }
     }
-    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
+    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"],#maincontent input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
         border: 1px solid #e1e1e1;
         border: 1px solid #e1e1e1;
         height: 40px;
         height: 40px;
         padding: 5px;
         padding: 5px;

app/design/frontend/Joshine/breeze/Magento_Customer/templates/form/forgotpassword.phtml

@@ -58,7 +58,7 @@
         padding: 0;
         padding: 0;
         text-align: left;
         text-align: left;
     }
     }
-    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
+    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"],#maincontent input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
         border: 1px solid #e1e1e1;
         border: 1px solid #e1e1e1;
         height: 50px;
         height: 50px;
         padding: 5px;
         padding: 5px;
@@ -68,7 +68,7 @@
     button.action.captcha-reload{
     button.action.captcha-reload{
         background: none;
         background: none;
     }
     }
-    .action.primary{
+    #maincontent .action.primary{
         vertical-align: middle;
         vertical-align: middle;
         -webkit-transform: perspective(1px) translateZ(0);
         -webkit-transform: perspective(1px) translateZ(0);
         transform: perspective(1px) translateZ(0);
         transform: perspective(1px) translateZ(0);

app/design/frontend/Joshine/breeze/Magento_Customer/templates/form/login.phtml

@@ -80,7 +80,7 @@
         font-family: Outfit-Regular;
         font-family: Outfit-Regular;
         font-size: 14px;
         font-size: 14px;
     }
     }
-    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
+    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"],#maincontent input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
         border: 1px solid #e1e1e1;
         border: 1px solid #e1e1e1;
         height: 50px;
         height: 50px;
         padding: 5px;
         padding: 5px;

app/design/frontend/Joshine/breeze/Magento_Customer/templates/form/register.phtml

@@ -64,7 +64,7 @@ $formData = $block->getFormData();
             line-height: 1;
             line-height: 1;
         }
         }
     }
     }
-    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
+    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"],#maincontent input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
         border: 1px solid #e1e1e1;
         border: 1px solid #e1e1e1;
         height: 50px;
         height: 50px;
         padding: 5px;
         padding: 5px;
@@ -93,7 +93,7 @@ $formData = $block->getFormData();
         padding: 0;
         padding: 0;
         text-align: left;
         text-align: left;
     }
     }
-    .action.primary{
+    #maincontent .action.primary{
         vertical-align: middle;
         vertical-align: middle;
         -webkit-transform: perspective(1px) translateZ(0);
         -webkit-transform: perspective(1px) translateZ(0);
         transform: perspective(1px) translateZ(0);
         transform: perspective(1px) translateZ(0);

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -1600,6 +1600,14 @@ footer{
     cursor: pointer;
     cursor: pointer;
     margin-top: 2px;
     margin-top: 2px;
   }
   }
+  .navigation .subchildmenu a{
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    cursor: pointer;
+    width: 100%;
+    display: inline-block;
+  }
 }
 }
 //.product-items .product-item-photo:hover {
 //.product-items .product-item-photo:hover {
 //  transform: scale(1.02);
 //  transform: scale(1.02);