Skip to content

Commit 2fc9834

Browse files
author
Momotenko,Natalia(nmomotenko)
committed
Merge pull request #112 from magento-webdev/PR-1
[WebDev+MPI+FearlessKiwis] Bugfixes
2 parents d82e753 + bf49cb3 commit 2fc9834

File tree

22 files changed

+130
-39
lines changed

22 files changed

+130
-39
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
<?php if ($_element->getLegend()): ?>
2020
<legend class="admin__legend legend">
2121
<span><?php /* @escapeNotVerified */ echo $_element->getLegend() ?></span>
22+
<?php echo $block->getHintHtml() ?>
2223
</legend><br/>
2324
<?php /* @escapeNotVerified */ echo $_element->getHeaderBar() ?>
24-
<?php endif; ?>
25+
<?php else: ?>
2526
<?php echo $block->getHintHtml() ?>
27+
<?php endif; ?>
2628
<div class="tree-store-scope">
2729
<?php if ($_element->getComment()): ?>
2830
<p class="comment"><?php echo $block->escapeHtml($_element->getComment()) ?></p>

‎app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div class="attribute-entity" data-bind="attr:{'data-attribute-title':label}">
1919
<div class="attribute-entity-top">
2020
<div class="attribute-entity-title-block">
21-
<span class="attribute-draggable"
21+
<span class="draggable-handle"
2222
data-role="draggable"
2323
title="<?= $block->escapeHtml(__('Sort Variations')) ?>">
2424
</span>

‎app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
<h2 class="steps-wizard-title"><?= /* @escapeNotVerified */ __('Step 1: Select Attributes') ?></h2>
1616
<div class="selected-attributes" data-bind="scope: '<?= /* @escapeNotVerified */ $block->getComponentName()?>'">
1717
<?= /* @escapeNotVerified */ __('Selected Attributes:') ?>
18-
<div data-bind="text: selectedAttributes() || '--'"></div>
18+
<span data-bind="text: selectedAttributes() || '--'"></span>
1919
</div>
20-
<?= $block->getChildHtml(); ?>
2120
</div>
22-
23-
24-
21+
<?= $block->getChildHtml(); ?>
2522
<script type="text/x-magento-init">
2623
{
2724
"*": {

‎app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<block class="Magento\Framework\View\Element\Text\ListText" name="paypal.additional.actions"/>
2828
<block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
2929
<block class="Magento\Framework\View\Element\RendererList" name="checkout.onepage.review.item.renderers" as="renderer.list"/>
30-
<block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="checkout/onepage/review/totals.phtml"/>
30+
<block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="Magento_Paypal::checkout/onepage/review/totals.phtml"/>
3131
</block>
3232
<block class="Magento\CheckoutAgreements\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="Magento_CheckoutAgreements::additional_agreements.phtml"/>
3333
</block>

‎app/code/Magento/Tax/Pricing/Render/Adjustment.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected function apply()
5454
$this->amountRender->setDisplayValue(
5555
$this->amountRender->getAmount()->getValue($this->getAdjustmentCode())
5656
);
57-
if ($this->taxHelper->priceIncludesTax()) {
57+
if ($this->taxHelper->priceIncludesTax() && $this->amountRender->getPriceType() == 'finalPrice') {
5858
// for dynamic calculations of prices with any options, use the base price amount
5959
$this->amountRender->setPriceType('basePrice');
6060
}

‎app/code/Magento/Ui/view/base/web/templates/grid/toolbar.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,15 @@
1515
<!-- /ko -->
1616
</div>
1717
<div class="admin__data-grid-header-row row row-gutter">
18+
<!-- ko if: hasChild('listing_massaction') -->
1819
<div class="col-xs-2" data-bind="scope: requestChild('listing_massaction')">
1920
<!-- ko template: getTemplate() --><!-- /ko -->
2021
</div>
21-
<div class="col-xs-10">
22+
<!-- /ko -->
23+
<div data-bind="css: {
24+
'col-xs-10': hasChild('listing_massaction'),
25+
'col-xs-12': !hasChild('listing_massaction')
26+
}">
2227
<div class="row">
2328
<div class="col-xs-3" data-bind="scope: requestChild('listing_paging')">
2429
<!-- ko template: totalTmpl --><!-- /ko -->

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
input[type="checkbox"].banner-content-checkbox {
7+
position: absolute;
8+
top: .8rem;
9+
10+
+ .addafter {
11+
line-height: 3.2rem;
12+
padding-left: 2.6rem;
13+
}
14+
}
15+
16+
.tree-store-scope {
17+
.field {
18+
.banner-content-checkbox {
19+
+ .addafter {
20+
padding: 0 0 0 2.6rem;
21+
}
22+
}
23+
}
24+
}

‎app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_attribute-values.less

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,13 @@
7373
}
7474

7575
.attribute-entity-top {
76+
.lib-vendor-prefix-display();
7677
margin: 0 0 @indent__s;
7778
&:extend(.abs-clearfix all);
7879
}
7980

80-
.attribute-entity-title-block {
81-
float: left;
82-
}
83-
8481
.attribute-entity-title {
85-
display: inline-block;
82+
display: inline;
8683
font-size: @steps-wizard-attribute-entity-title__font-size;
8784
}
8885

@@ -92,7 +89,8 @@
9289
}
9390

9491
.attribute-entity-actions {
95-
float: right;
92+
margin-left: auto;
93+
white-space: nowrap;
9694
}
9795

9896
.draggable-handle {

‎app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_select-attributes.less

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99

1010
.steps-wizard {
1111
.select-attributes-block {
12+
&:extend(.abs-clearfix all);
1213
margin: 0 0 @indent__base;
1314
}
1415
.select-attributes-actions {
15-
&:extend(.abs-clearfix all);
16+
float:right;
17+
margin-bottom: @indent__s;
1618
.action-default {
1719
&:extend(.abs-action-secondary all);
1820
&:extend(.abs-action-l all);
19-
float: right;
2021
}
2122
}
2223
}

‎app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#mix-grid .width(9,12);
4949
margin-left: 0;
5050
}
51+
5152
.order-sidebar {
5253
#mix-grid .column(3,12);
5354
margin-left: 0;
@@ -72,6 +73,21 @@
7273
}
7374
}
7475

76+
//
77+
// Tablets
78+
// _____________________________________________
79+
80+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) {
81+
.order-details {
82+
.order-search-items {
83+
.action-configure {
84+
display: block;
85+
float: none;
86+
}
87+
}
88+
}
89+
}
90+
7591
.order-view {
7692
> .ui-tabs-panel {
7793
border: 0;

‎app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@
1111
.admin__fieldset {
1212
&:extend(.abs-clearfix all);
1313
}
14+
1415
.admin__field {
1516
margin-bottom: 0;
1617
}
18+
1719
.field-group_id {
1820
float: left;
1921
}
22+
2023
.field-email {
21-
margin-top: 0;
24+
display: inline-block;
25+
margin: 0;
2226
overflow: hidden;
27+
width: 50%;
2328
}
2429
}

‎app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,26 +125,44 @@
125125
.extend__visually-hidden();
126126
}
127127
}
128+
128129
.create-order-sidebar-block {
129130
.sidebar-title-block {
130131
margin: 0 0 @order-create-sidebar__margin;
131132
}
133+
132134
.auto-scroll {
133135
margin: 0 -@order-create-sidebar__padding @order-create-sidebar__margin__s;
134136
max-height: @order-create-sidebar-scroll__height;
135137
overflow: auto;
136138
position: relative;
139+
140+
// Force a scroll bar to appear on IOS devices
141+
&::-webkit-scrollbar {
142+
-webkit-appearance: none;
143+
height: 4px;
144+
}
145+
146+
&::-webkit-scrollbar-thumb {
147+
-webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
148+
background-color: rgba(0,0,0,.5);
149+
border-radius: 4px;
150+
}
151+
137152
+ .action-default {
138153
margin-top: @order-create-sidebar__margin__reqular;
139154
}
155+
140156
.no-items {
141157
padding-left: @order-create-sidebar__padding;
142158
}
143159
}
160+
144161
.admin__field-option {
145162
padding-top: 0;
146163
}
147164
}
165+
148166
.create-order-sidebar-label {
149167
display: table-cell;
150168
font-size: @order-create-sidebar__font-size;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
float: left;
4949
max-width: 45.5rem;
5050
position: relative;
51-
width: 50%;
51+
width: 35%;
5252
:-ms-input-placeholder {
5353
font-style: italic;
5454
}

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_selects.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
padding-right: @form-el__padding-side;
7979
width: 100%;
8080
}
81+
&::-ms-expand {
82+
display: none;
83+
}
8184
}
8285
}
8386

‎app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multicheck.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
}
7676
}
7777
.action-menu {
78-
left: -(@data-grid-cell__padding-horizontal + @data-grid-cell__border-width + .1rem);
78+
left: -(@data-grid-cell__padding-horizontal + @data-grid-cell__border-width);
7979
margin-top: 1px;
8080
right: auto;
8181
text-align: left;

‎app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
font-size: @modal-action-close__font-size;
5555
}
5656
&:focus {
57-
background: none;
57+
background-color: transparent;
5858
}
5959
}
6060
}

‎app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
background-position+: ~'calc(100% - @{field-control__height})' 0;
7575
background-size+: 1px 100%;
7676

77+
max-width: 100%;
7778
min-width: 8.5rem;
7879
padding-bottom: @field-control__padding-bottom - .1rem;
7980
padding-right: 4.4rem; // Distance between select switch and inner text
@@ -225,11 +226,11 @@ option:empty {
225226
[class*='admin__control-'][class] {
226227
.lib-css(appearence,none);
227228
.lib-vendor-prefix-flex-grow(1);
229+
.lib-vendor-prefix-order(1);
228230
.lib-vendor-prefix-flex-shrink(1);
229231
box-shadow: none;
230232
background-color: transparent;
231233
border-color: transparent;
232-
order: 1;
233234
vertical-align: top;
234235
& + [class*='admin__control-'] {
235236
border-left-color: @field-control__border-color;
@@ -287,13 +288,14 @@ option:empty {
287288
padding: 0;
288289
}
289290
&-suffix {
290-
order: 3;
291+
.lib-vendor-prefix-order(3);
292+
291293
&:last-child {
292294
padding-right: 1rem;
293295
}
294296
}
295297
&-prefix {
296-
order: 0;
298+
.lib-vendor-prefix-order(0);
297299
}
298300
}
299301

‎app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,10 @@ label.mage-error {
373373
*:after {
374374
box-sizing: border-box;
375375
}
376+
376377
.admin__data-grid-header-row {
377378
&:extend(.abs-cleafix);
379+
378380
.action-select-multiselect {
379381
height: 38px;
380382
left: -1rem;
@@ -383,9 +385,15 @@ label.mage-error {
383385
top: -1.2rem;
384386
width: 52px;
385387
}
386-
> div + div {
388+
389+
> div {
387390
margin-left: @temp_gutter;
391+
392+
&:first-child {
393+
margin-left: 0;
394+
}
388395
}
396+
389397
button {
390398
vertical-align: top;
391399
}
@@ -445,6 +453,27 @@ label.mage-error {
445453
}
446454
}
447455

456+
//
457+
// Tablets
458+
// _____________________________________________
459+
460+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) {
461+
.admin__data-grid-toolbar {
462+
.admin__data-grid-header-row {
463+
.admin__filter-actions {
464+
float: none;
465+
margin-bottom: @indent__base;
466+
}
467+
}
468+
469+
.admin__data-grid-header-row {
470+
.admin__control-support-text {
471+
margin-left: 0;
472+
}
473+
}
474+
}
475+
}
476+
448477
.admin__grid-control {
449478
.admin__grid-control {
450479
display: none;

‎app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,7 +2181,7 @@
21812181
}
21822182
.field {
21832183
margin: 0 0 5px;
2184-
input[type="checkbox"] {
2184+
input[type="checkbox"]:not(.banner-content-checkbox) {
21852185
margin-right: 8px;
21862186
position: relative;
21872187
top: 2px;
@@ -2632,14 +2632,6 @@
26322632
min-width: 20%;
26332633
}
26342634

2635-
// Content
2636-
2637-
.field-store_0_content_use input[type="checkbox"] {
2638-
margin-right: 8px;
2639-
position: relative;
2640-
top: 2px;
2641-
}
2642-
26432635
//
26442636
// CMS -> Manage Hierarchy
26452637
// --------------------------------------

0 commit comments

Comments
 (0)