Skip to content

Commit 044de2d

Browse files
author
Kolesov, Ievgen(ikolesov)
committed
Merge pull request #211 from magento-webdev/PR-4
[WebDev] Bugfixes
2 parents 1feb9f4 + 395d85f commit 044de2d

File tree

11 files changed

+127
-43
lines changed

11 files changed

+127
-43
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<?php
1111
/* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
1212
$element = $block->getElement();
13-
$note = $element->getNote() ? '<div class="note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
13+
$note = $element->getNote() ? '<div class="note admin__field-note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
1414
$elementBeforeLabel = $element->getExtType() == 'checkbox admin__control-checkbox' || $element->getExtType() == 'radio admin__control-radio';
1515
$addOn = ($element->getBeforeElementHtml() || $element->getAfterElementHtml()) && !$element->getNoWrapAsAddon();
1616
$fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : '';

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
<div class="mass-select-wrap">
4545
<select
4646
id="<?php echo $block->getHtmlId() ?>-mass-select"
47-
class="action-select-multiselect"
47+
class="action-select-multiselect _disabled"
48+
disabled="disabled"
4849
data-menu="grid-mass-select">
4950
<optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
5051
<option disabled selected></option>
@@ -68,10 +69,14 @@
6869
</div>
6970

7071
<script>
71-
require(['jquery'], function($){
72+
require(['jquery', 'domReady!'], function($){
7273
'use strict';
73-
$('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
74+
$('#<?php echo $block->getHtmlId() ?>-mass-select')
75+
.removeClass('_disabled')
76+
.prop('disabled', false)
77+
.change(function () {
7478
var massAction = $('option:selected', this).val();
79+
this.blur();
7580
switch (massAction) {
7681
<?php if ($block->getUseSelectAll()):?>
7782
case 'selectAll':
@@ -88,7 +93,6 @@
8893
return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
8994
break;
9095
}
91-
this.blur();
9296
});
9397
});
9498
<?php if (!$block->getParentBlock()->canDisplayContainer()): ?>

‎app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
); ?>
1818
</p>
1919
<h3 class="page-sub-sub-title"><?php /* @escapeNotVerified */ echo __('Featured Platinum Partners'); ?></h3>
20-
<div data-role="partners-block">
20+
<div data-role="partners-block" class="partners-block">
2121
<div data-role="spinner" class="admin__data-grid-loading-mask" data-bind="visible: loading">
2222
<div class="spinner">
2323
<span></span><span></span><span></span><span></span>

‎app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,26 @@
1111
$partners = $block->getPartners();
1212
?>
1313
<?php if ($partners) : ?>
14-
<div class="row row-gutter">
15-
<?php foreach ($block->getPartners() as $partner) : ?>
16-
<div class="col-m-4">
17-
<img
18-
class="partner-image"
19-
src="<?php echo $block->escapeHtml($partner['img']);?>"
20-
alt="<?php echo $block->escapeHtml($partner['title']);?>"/>
21-
<h3 class="partner-title"><?php echo $block->escapeHtml($partner['title']);?></h3>
22-
<p class="partner-description">
23-
<?php echo $block->escapeHtml($partner['description']);?>
24-
<br />
25-
<a href="<?php echo $block->escapeHtml($partner['url_page']);?>" target="_blank">
26-
<?php /* @escapeNotVerified */ echo __('Read More'); ?>
27-
</a>
28-
<br />
29-
<a href="<?php echo $block->escapeHtml($partner['url_partner_page']);?>" target="_blank">
30-
<?php /* @escapeNotVerified */ echo __('Partner Page'); ?>
31-
</a>
32-
</p>
33-
</div>
34-
<?php endforeach; ?>
35-
</div>
14+
<?php foreach ($block->getPartners() as $partner) : ?>
15+
<div class="partner">
16+
<img
17+
class="partner-image"
18+
src="<?php echo $block->escapeHtml($partner['img']);?>"
19+
alt="<?php echo $block->escapeHtml($partner['title']);?>"/>
20+
<h3 class="partner-title"><?php echo $block->escapeHtml($partner['title']);?></h3>
21+
<p class="partner-description">
22+
<?php echo $block->escapeHtml($partner['description']);?>
23+
<br />
24+
<a href="<?php echo $block->escapeHtml($partner['url_page']);?>" target="_blank">
25+
<?php /* @escapeNotVerified */ echo __('Read More'); ?>
26+
</a>
27+
<br />
28+
<a href="<?php echo $block->escapeHtml($partner['url_partner_page']);?>" target="_blank">
29+
<?php /* @escapeNotVerified */ echo __('Partner Page'); ?>
30+
</a>
31+
</p>
32+
</div>
33+
<?php endforeach; ?>
3634
<?php else : ?>
3735
<p>
3836
<?php /* @escapeNotVerified */ echo __('No partners were found'); ?>

‎app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ protected function _prepareForm()
7575
$fieldset->addField(
7676
'order_statuses',
7777
'multiselect',
78-
['name' => 'order_statuses', 'values' => $values, 'display' => 'none'],
78+
[
79+
'name' => 'order_statuses',
80+
'label' => '',
81+
'values' => $values,
82+
'display' => 'none'
83+
],
7984
'show_order_statuses'
8085
);
8186

‎app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ protected function _prepareForm()
8181
$fieldset->addField(
8282
'rules_list',
8383
'multiselect',
84-
['name' => 'rules_list', 'values' => $rulesListOptions, 'display' => 'none'],
84+
[
85+
'name' => 'rules_list',
86+
'label' => '',
87+
'values' => $rulesListOptions,
88+
'display' => 'none'
89+
],
8590
'price_rule_type'
8691
);
8792

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,28 @@
1010
.page-partners {
1111
border-top: 1px solid @page-main-actions__border-color;
1212
padding-top: 2.5rem;
13+
14+
.partners-block {
15+
.lib-vendor-prefix-display(flex);
16+
.lib-vendor-prefix-flex-direction(row);
17+
.lib-vendor-prefix-flex-wrap(wrap);
18+
19+
.ie9 & {
20+
word-spacing: -.45rem;
21+
}
22+
}
23+
24+
.partner {
25+
margin-bottom: @indent__xl;
26+
padding: 0 @indent__m;
27+
width: 100% / 3;
28+
29+
.ie9 & {
30+
display: inline-block;
31+
vertical-align: top;
32+
word-spacing: normal;
33+
}
34+
}
1335
}
1436

1537
.partners-description,

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
.admin__data-grid-loading-mask {
4040
background: rgba(255, 255, 255, .5);
4141
bottom: 0;
42-
left: -@page-content__padding-horizontal;
42+
left: 0;
4343
position: absolute;
44-
right: -@page-content__padding-horizontal;
44+
right: 0;
4545
top: 0;
4646
z-index: @data-grid-overlay__z-index;
4747

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
.block-category-event {
1919
.lib-css(background, @catalog-event-background-color);
2020
.lib-css(color, @catalog-event-color);
21-
text-align: center;
2221
padding: @indent__s 0 15px;
22+
text-align: center;
2323

2424
&.block:last-child {
2525
margin-bottom: @indent__s;
@@ -36,6 +36,7 @@
3636

3737
.ticker {
3838
.lib-list-reset-styles();
39+
3940
li {
4041
display: none;
4142
margin: 0 15px;
@@ -47,31 +48,41 @@
4748
}
4849

4950
.label {
51+
.lib-font-size(10);
5052
display: block;
5153
text-transform: lowercase;
52-
.lib-font-size(10);
5354
}
5455
}
5556

5657
.dates {
58+
display: table;
59+
margin: 0 auto;
60+
5761
.start,
5862
.end {
59-
display: block;
63+
display: table-cell;
64+
vertical-align: top;
6065
}
6166

6267
.date {
63-
.lib-font-size(50);
68+
.lib-font-size(18);
6469
}
6570

6671
.time {
6772
display: block;
6873
}
6974

7075
.start {
76+
padding-right: @indent__xl;
77+
position: relative;
78+
7179
&:after {
80+
.lib-font-size(18);
7281
content: "\2013";
73-
.lib-font-size(50);
7482
display: block;
83+
position: absolute;
84+
right: 15px;
85+
top: 0;
7586
}
7687
}
7788
}
@@ -114,19 +125,16 @@
114125
}
115126

116127
.dates {
117-
.start,
118-
.end {
119-
display: inline-block;
128+
.date {
129+
.lib-font-size(50);
120130
}
121131

122132
.start {
123133
padding-right: 50px;
124-
position: relative;
125134

126135
&:after {
127-
position: absolute;
136+
.lib-font-size(50);
128137
right: 10px;
129-
top: 0;
130138
}
131139
}
132140
}

‎app/design/frontend/Magento/luma/Magento_AdvancedSearch/web/css/source/_module.less

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Advanced Search
8+
// _____________________________________________
9+
10+
// This part of code fixes the gap between page title and error message
11+
// In Luma on Mobile screens we have top padding on '.column' to give room for absolutely positioned toolbar controls.
12+
// If Advanced Search returns no results, controls do not appear, and visual gap appears.
13+
// We compensate it with negative top margin applied to '.message.error' on Mobile screens.
14+
15+
//
16+
// Common
17+
// _____________________________________________
18+
19+
& when (@media-common = true) {
20+
.catalogsearch-advanced-result {
21+
.message {
22+
&.error {
23+
margin-top: -60px;
24+
}
25+
}
26+
}
27+
}
28+
29+
//
30+
// Desktop
31+
// _____________________________________________
32+
33+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
34+
.catalogsearch-advanced-result {
35+
.message {
36+
&.error {
37+
margin-top: 0;
38+
}
39+
}
40+
}
41+
}

‎app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,7 @@ body.catalog-product-compare-index {
819819

820820
.action.delete {
821821
&:extend(.abs-remove-button-for-blocks all);
822+
margin-right: .6rem;
822823
}
823824
}
824825
}

0 commit comments

Comments
 (0)