Skip to content

Commit 8d070c5

Browse files
authored
ENGCOM-6024: Replace deprecated "nobr" element #24888
2 parents 61a5a30 + 04d2368 commit 8d070c5

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

lib/web/css/docs/layout.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@
5555
<tr>
5656
<th>@layout-class-1column</th>
5757
<td class="vars_value">page-layout-1column</td>
58-
<td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
58+
<td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
5959
<td>Class name for one column layout</td>
6060
</tr>
6161
<tr>
6262
<th>@layout-class-2columns__left</th>
6363
<td class="vars_value">page-layout-2columns-left</td>
64-
<td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
64+
<td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
6565
<td>Class name for two columns layout with left sidebar</td>
6666
</tr>
6767
<tr>
6868
<th nowrap="nowrap">@layout-class-2columns__right</th>
6969
<td class="vars_value">page-layout-2columns-right</td>
70-
<td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
70+
<td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
7171
<td>Class name for two columns layout with right sidebar</td>
7272
</tr>
7373
<tr>
7474
<th>@layout-class-3columns</th>
7575
<td class="vars_value">page-layout-3columns</td>
76-
<td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
76+
<td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
7777
<td>Class name for three columns layout with left sidebar</td>
7878
</tr>
7979
<tr>

lib/web/css/docs/responsive.html

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

lib/web/css/docs/source/_layout.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,25 @@ footer.footer {
5757
// <tr>
5858
// <th>@layout-class-1column</th>
5959
// <td class="vars_value">page-layout-1column</td>
60-
// <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
60+
// <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
6161
// <td>Class name for one column layout</td>
6262
// </tr>
6363
// <tr>
6464
// <th>@layout-class-2columns__left</th>
6565
// <td class="vars_value">page-layout-2columns-left</td>
66-
// <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
66+
// <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
6767
// <td>Class name for two columns layout with left sidebar</td>
6868
// </tr>
6969
// <tr>
7070
// <th nowrap="nowrap">@layout-class-2columns__right</th>
7171
// <td class="vars_value">page-layout-2columns-right</td>
72-
// <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
72+
// <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
7373
// <td>Class name for two columns layout with right sidebar</td>
7474
// </tr>
7575
// <tr>
7676
// <th>@layout-class-3columns</th>
7777
// <td class="vars_value">page-layout-3columns</td>
78-
// <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
78+
// <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
7979
// <td>Class name for three columns layout with left sidebar</td>
8080
// </tr>
8181
// <tr>

lib/web/css/docs/source/_responsive.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// */
55

66
// # Responsive
7-
// Magento UI library provides a strong approach for working with media queries. It`s based on recursive call of <nobr><code>.media-width()</code></nobr> mixin defined anywhere in project but invoked in one place in <nobr><code>lib/web/css/source/lib/_responsive.less</code></nobr>. That's why in the resulting <code>styles.css</code> we have every media query only once with all the rules there, not a multiple calls for the same query.
7+
// Magento UI library provides a strong approach for working with media queries. It`s based on recursive call of <span style="white-space: nowrap"><code>.media-width()</code></span> mixin defined anywhere in project but invoked in one place in <span style="white-space: nowrap"><code>lib/web/css/source/lib/_responsive.less</code></span>. That's why in the resulting <code>styles.css</code> we have every media query only once with all the rules there, not a multiple calls for the same query.
88
//
99
// To see the media queries work resize window to understand which breakpoint is applied.
1010
// ```
@@ -43,8 +43,8 @@
4343
// ```css
4444
// .media-width(<@extremum>, <@break>);
4545
// ```
46-
// <nobr><code>@extremum: max|min</code></nobr> - sets whether to use **min-width** or **max-width** in media query condition<br />
47-
// <nobr><code>@break: value</code></nobr> - sets the value of breakpoint to compare with in media query condition.<br />
46+
// <span style="white-space: nowrap"><code>@extremum: max|min</code></span> - sets whether to use **min-width** or **max-width** in media query condition<br />
47+
// <span style="white-space: nowrap"><code>@break: value</code></span> - sets the value of breakpoint to compare with in media query condition.<br />
4848
// For example
4949
// ```css
5050
// .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {

lib/web/css/docs/source/_variables.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4169,25 +4169,25 @@
41694169
// <tr>
41704170
// <th>@layout-class-1column</th>
41714171
// <td class="vars_value">page-layout-1column</td>
4172-
// <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
4172+
// <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
41734173
// <td>Class name for one column layout</td>
41744174
// </tr>
41754175
// <tr>
41764176
// <th>@layout-class-2columns__left</th>
41774177
// <td class="vars_value">page-layout-2columns-left</td>
4178-
// <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
4178+
// <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
41794179
// <td>Class name for two columns layout with left sidebar</td>
41804180
// </tr>
41814181
// <tr>
41824182
// <th nowrap="nowrap">@layout-class-2columns__right</th>
41834183
// <td class="vars_value">page-layout-2columns-right</td>
4184-
// <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
4184+
// <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
41854185
// <td>Class name for two columns layout with right sidebar</td>
41864186
// </tr>
41874187
// <tr>
41884188
// <th>@layout-class-3columns</th>
41894189
// <td class="vars_value">page-layout-3columns</td>
4190-
// <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
4190+
// <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
41914191
// <td>Class name for three columns layout with left sidebar</td>
41924192
// </tr>
41934193
// <tr>

lib/web/css/docs/variables.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4168,25 +4168,25 @@ <h2 id="layout-variables">Layout variables</h2>
41684168
<tr>
41694169
<th>@layout-class-1column</th>
41704170
<td class="vars_value">page-layout-1column</td>
4171-
<td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
4171+
<td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
41724172
<td>Class name for one column layout</td>
41734173
</tr>
41744174
<tr>
41754175
<th>@layout-class-2columns__left</th>
41764176
<td class="vars_value">page-layout-2columns-left</td>
4177-
<td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
4177+
<td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
41784178
<td>Class name for two columns layout with left sidebar</td>
41794179
</tr>
41804180
<tr>
41814181
<th nowrap="nowrap">@layout-class-2columns__right</th>
41824182
<td class="vars_value">page-layout-2columns-right</td>
4183-
<td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
4183+
<td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
41844184
<td>Class name for two columns layout with right sidebar</td>
41854185
</tr>
41864186
<tr>
41874187
<th>@layout-class-3columns</th>
41884188
<td class="vars_value">page-layout-3columns</td>
4189-
<td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
4189+
<td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
41904190
<td>Class name for three columns layout with left sidebar</td>
41914191
</tr>
41924192
<tr>

0 commit comments

Comments
 (0)