Skip to content

Commit f8b0754

Browse files
adifucanadifucan
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-52248
2 parents 3ea7fcb + 2b0d791 commit f8b0754

File tree

17 files changed

+1474
-1187
lines changed

17 files changed

+1474
-1187
lines changed

‎app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,15 @@ define([
282282
return this.relatedData.slice(this.startIndex, this.startIndex + this.pageSize);
283283
},
284284

285+
/**
286+
* Get number of columns
287+
*
288+
* @returns {Number} columns
289+
*/
290+
getColumnsCount: function () {
291+
return this.labels().length + (this.dndConfig.enabled ? 1 : 0);
292+
},
293+
285294
/**
286295
* Processing pages before addChild
287296
*

‎app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@
1010
</label>
1111

1212
<div class="admin__field-control" data-role="grid-wrapper" attr="'data-index': index">
13-
14-
<div class="admin__control-table-pagination" visible="!!$data.recordData().length">
15-
<div class="admin__data-grid-pager">
16-
<button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
17-
<input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
18-
<label class="admin__control-support-text" data-bind="attr: {for: ko.uid}, text: 'of ' + pages()"></label>
19-
<button class="action-next" type="button" data-bind="attr: {title: $t('Next Page')}, click: nextPage, disable: isLast()"></button>
20-
</div>
21-
</div>
22-
2313
<div class="admin__control-table-wrapper">
2414
<div data-role="spinner"
2515
class="admin__data-grid-loading-mask"
@@ -28,44 +18,59 @@
2818
<span repeat="8"/>
2919
</div>
3020
</div>
21+
3122
<table class="admin__dynamic-rows admin__control-table" data-role="grid" attr="{'data-index': index}">
3223
<thead if="element.columnsHeader">
33-
<tr>
34-
<th if="dndConfig.enabled"/>
35-
<th repeat="foreach: labels, item: '$label'"
36-
text="$label().label"
37-
css="setClasses($label())"
38-
visible="$label().visible"
39-
disable="$label().disabled"
40-
attr="{'data-name': name}"/>
41-
</th>
42-
</tr>
24+
<tr>
25+
<th if="dndConfig.enabled"/>
26+
<th repeat="foreach: labels, item: '$label'"
27+
text="$label().label"
28+
css="setClasses($label())"
29+
visible="$label().visible"
30+
disable="$label().disabled"
31+
attr="{'data-name': name}"/>
32+
</th>
33+
</tr>
4334
</thead>
4435

4536
<tbody>
46-
<tr class="data-row" repeat="foreach: elems, item: '$record'">
47-
<td if="dndConfig.enabled"
48-
class="col-draggable"
49-
template="name: dndConfig.template, data: dnd"/>
37+
<tr class="data-row" repeat="foreach: elems, item: '$record'">
38+
<td if="dndConfig.enabled"
39+
class="col-draggable"
40+
template="name: dndConfig.template, data: dnd"/>
5041

51-
<!-- ko fastForEach: { data: $record().elems, as: 'elem'} -->
52-
<td if="elem.template"
53-
css="$parent.setClasses(elem)"
54-
visible="elem.visible"
55-
disable="elem.disabled"
56-
template="elem.template"/>
57-
<!-- /ko -->
58-
</tr>
42+
<!-- ko fastForEach: { data: $record().elems, as: 'elem'} -->
43+
<td if="elem.template"
44+
css="$parent.setClasses(elem)"
45+
visible="elem.visible"
46+
disable="elem.disabled"
47+
template="elem.template"/>
48+
<!-- /ko -->
49+
</tr>
5950
</tbody>
60-
</table>
61-
</div>
6251

63-
<div class="admin__control-table-action" if="element.addButton">
64-
<button attr="{disabled: disabled, 'data-action': 'add_new_row'}"
65-
type="button"
66-
click="processingAddChild.bind($data, false, false, false)">
67-
<span text="addButtonLabel"/>
68-
</button>
52+
<tfoot>
53+
<tr>
54+
<td attr="{'colspan': element.getColumnsCount()}">
55+
<button if="element.addButton"
56+
attr="{disabled: disabled, 'data-action': 'add_new_row'}"
57+
type="button"
58+
click="processingAddChild.bind($data, false, false, false)">
59+
<span text="addButtonLabel"/>
60+
</button>
61+
62+
<div class="admin__control-table-pagination" visible="!!$data.recordData().length && (pages() > 1)">
63+
<div class="admin__data-grid-pager">
64+
<button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
65+
<input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
66+
<label class="admin__control-support-text" data-bind="attr: {for: ko.uid}, text: 'of ' + pages()"></label>
67+
<button class="action-next" type="button" data-bind="attr: {title: $t('Next Page')}, click: nextPage, disable: isLast()"></button>
68+
</div>
69+
</div>
70+
</td>
71+
</tr>
72+
</tfoot>
73+
</table>
6974
</div>
7075
</div>
71-
</div>
76+
</div>

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
&.admin__fieldset {
88
padding: 0;
99

10-
.admin__field {
10+
> .admin__field {
1111
margin-left: -@temp_gutter;
1212
}
1313
}
@@ -22,6 +22,16 @@
2222
text-align: left;
2323
}
2424
}
25+
26+
[class*='field-website_label'] {
27+
.admin__field-label {
28+
text-align: right;
29+
}
30+
31+
.admin__field-tooltip {
32+
margin: -.2rem 0 0 -@indent__m;
33+
}
34+
}
2535
}
2636

2737
.store-scope {

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_dashboard.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
font-size: @dashboard__font-size__base;
2222
width: 100%;
2323

24+
tr {
25+
&._clickable {
26+
cursor: pointer;
27+
}
28+
}
29+
2430
th,
2531
td {
2632
padding: 1rem 0 1rem 1rem;

‎app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
}
6262
}
6363

64-
.catalog-category-edit {
64+
.catalog-category-edit,
65+
.catalog-category-add {
6566
// TODO: refactor trees
6667
.x-tree.tree-wrapper {
6768
overflow-x: auto;

‎app/design/adminhtml/Magento/backend/Magento_GiftCard/web/css/source/_module-old.less

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/design/adminhtml/Magento/backend/Magento_GiftCard/web/css/source/_module.less

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// /**
2+
// * Copyright © 2016 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
.admin__field-amount {
7+
.admin__control-table {
8+
width: auto;
9+
}
10+
11+
tbody {
12+
.admin__control-text {
13+
min-width: @field-size__s;
14+
}
15+
}
16+
}

‎app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,23 @@
4949
padding-top: 0;
5050
}
5151
}
52+
53+
td {
54+
border-top: 1px solid @control-table-cell__border-color;
55+
}
56+
57+
.admin__control-table-pagination {
58+
float: right;
59+
padding-bottom: 0;
60+
}
61+
62+
.action-previous {
63+
margin-right: .5rem;
64+
}
65+
66+
.action-next {
67+
margin-left: .9rem;
68+
}
5269
}
5370

5471
tr {

‎app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less

Lines changed: 70 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,69 +3,93 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
.fotorama-video-container {
7-
&:after {
8-
background: url(../Magento_ProductVideo/img/gallery-sprite.png) bottom right;
6+
//
7+
// Common
8+
// _____________________________________________
9+
10+
& when (@media-common = true) {
11+
.fotorama-video-container {
12+
&:after {
13+
background: url(../Magento_ProductVideo/img/gallery-sprite.png) bottom right;
14+
bottom: 0;
15+
content: '';
16+
height: 100px;
17+
left: 0;
18+
margin: auto;
19+
position: absolute;
20+
right: 0;
21+
top: 12px;
22+
width: 100px;
23+
}
24+
25+
.magnify-lens {
26+
display: none !important;
27+
}
28+
29+
&.video-unplayed {
30+
&:hover {
31+
img {
32+
opacity: 0.6;
33+
}
34+
35+
&:after {
36+
transform: scale(1.25);
37+
}
38+
}
39+
}
40+
}
41+
42+
.video-thumb-icon:after {
43+
background: url(../Magento_ProductVideo/img/gallery-sprite.png) bottom left;
944
bottom: 0;
1045
content: '';
11-
height: 100px;
46+
height: 40px;
1247
left: 0;
1348
margin: auto;
1449
position: absolute;
1550
right: 0;
16-
top: 12px;
17-
width: 100px;
51+
top: 10px;
52+
width: 49px;
1853
}
1954

20-
.magnify-lens {
21-
display: none !important;
22-
}
23-
24-
&.video-unplayed {
25-
&:hover {
26-
img {
27-
opacity: 0.6;
28-
}
55+
.product-video {
56+
height: 75%;
57+
left: 0;
58+
position: absolute;
59+
top: 0;
60+
width: 100%;
61+
right: 0;
62+
bottom: 0;
63+
margin: auto;
2964

30-
&:after {
31-
transform: scale(1.25);
32-
}
65+
iframe {
66+
height: 100%;
67+
left: 0;
68+
position: absolute;
69+
top: 0;
70+
width: 100%;
71+
z-index: 9999;
3372
}
3473
}
35-
}
3674

37-
.video-thumb-icon:after {
38-
background: url(../Magento_ProductVideo/img/gallery-sprite.png) bottom left;
39-
bottom: 0;
40-
content: '';
41-
height: 40px;
42-
left: 0;
43-
margin: auto;
44-
position: absolute;
45-
right: 0;
46-
top: 10px;
47-
width: 49px;
48-
}
49-
50-
.product-video {
51-
height: 75%;
52-
left: 0;
53-
position: absolute;
54-
top: 0;
55-
width: 100%;
56-
right: 0;
57-
bottom: 0;
58-
margin: auto;
59-
iframe {
60-
height: 100%;
75+
.fotorama__stage__shaft:focus .fotorama__stage__frame.fotorama__active:after {
76+
bottom: 0;
77+
content: '';
78+
height: 100px;
6179
left: 0;
80+
margin: auto;
6281
position: absolute;
63-
top: 0;
64-
width: 100%;
65-
z-index: 9999;
82+
right: 0;
83+
top: 12px;
84+
width: 100px;
6685
}
6786
}
6887

88+
//
89+
// Mobile
90+
// _____________________________________________
91+
92+
// @TODO UI: check possibility to use .media-width() mixin
6993
@media only screen
7094
and (min-device-width : 320px)
7195
and (max-device-width : 780px)
@@ -75,15 +99,3 @@ and (orientation : landscape) {
7599
width: 81%;
76100
}
77101
}
78-
79-
.fotorama__stage__shaft:focus .fotorama__stage__frame.fotorama__active:after {
80-
bottom: 0;
81-
content: '';
82-
height: 100px;
83-
left: 0;
84-
margin: auto;
85-
position: absolute;
86-
right: 0;
87-
top: 12px;
88-
width: 100px;
89-
}

0 commit comments

Comments
 (0)