Skip to content

[Forwardport] Remove extra spaces from Magento/Ui #17054

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

Merged
merged 1 commit into from
Jul 25, 2018
Merged

[Forwardport] Remove extra spaces from Magento/Ui #17054

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<legend class="admin__legend">
<span text="$parent.label"/>
</legend><br />

<each args="getRegion('body')" render=""/>
</fieldset>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
<div class="admin__field-control"
css="'_with-tooltip': $data.tooltip">
<div class="admin__field admin__field-option" outereach="options">
<input
<input
ko-checked="$parent.value"
ko-disabled="$parent.disabled"
css="
'admin__control-radio': !$parent.multiple,
'admin__control-checkbox': $parent.multiple"
attr="
id: ++ko.uid,
id: ++ko.uid,
value: value,
type: $parent.multiple ? 'checkbox' : 'radio'"/>

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/templates/form/field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="admin__field-note" if="$data.notice" attr="id: noticeId">
<span translate="notice"/>
</div>

<div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>

<render args="$data.service.template" if="$data.hasService()"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</button>
</with>
</if>

<if args="$data.isEditor">
<label class="admin__field-label admin__field-label-vertical" attr="for: uid" translate="'All in Column'"/>
<render/>
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<span class="data-grid-row-changed" css="_changed: $parent.hasChanges">
<span class="data-grid-row-changed-tooltip" translate="'Record contains unsaved changes.'"/>
</span>
</td>
</td>

<!-- ko ifnot: $parent.isActionsColumn($data) -->
<td if="$col.isEditor" template="$parent.fieldTmpl"/>
<td ifnot="$col.isEditor" css="$col.getFieldClass()" template="$col.getBody()"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div style="display: none;" css="stickyClass" afterRender="setStickyNode">
<span class="data-grid-cap-left" afterRender="setLeftCap"/>
<span class="data-grid-cap-right" afterRender="setRightCap"/>

<div afterRender="setStickyToolbarNode">
<div class="admin__data-grid-header">
<div class="admin__data-grid-header-row">
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/templates/group/group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<render args="elementTmpl" if="element.input_type == 'checkbox' || element.input_type == 'radio'"/>
</if>
</each>

<each args="getRegion('insideGroup')" render=""/>

<each args="elems" if="validateWholeGroup">
Expand Down