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

fix: prevent inline-block issue in name form due to space and font-size #16048

Merged
merged 1 commit into from Jun 13, 2018
+6 −23
Merged

fix: prevent inline-block issue in name form due to space and font-size #16048

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
29 changes: 6 additions & 23 deletions app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,15 @@ $suffix = $block->showSuffix();
?>
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
<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>
<div class="control">
<fieldset class="fieldset fieldset-fullname">
<div class="fields">
<?php endif; ?>

<?php if ($prefix): ?>
<div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
<span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
</label>

<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span></label>
<div class="control">
<?php if ($block->getPrefixOptions() === false): ?>
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
Expand All @@ -65,10 +60,7 @@ $suffix = $block->showSuffix();
</div>
<?php endif; ?>
<div class="field field-name-firstname required">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
<span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
</label>

<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span></label>
<div class="control">
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
Expand All @@ -80,10 +72,7 @@ $suffix = $block->showSuffix();
<?php if ($middle): ?>
<?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
<div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
<span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
</label>

<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span></label>
<div class="control">
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
Expand All @@ -94,10 +83,7 @@ $suffix = $block->showSuffix();
</div>
<?php endif; ?>
<div class="field field-name-lastname required">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
<span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
</label>

<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span></label>
<div class="control">
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
Expand All @@ -108,10 +94,7 @@ $suffix = $block->showSuffix();
</div>
<?php if ($suffix): ?>
<div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
<span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
</label>

<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span></label>
<div class="control">
<?php if ($block->getSuffixOptions() === false): ?>
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
Expand Down