Skip to content

Commit 9ae5bba

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #718 from magento-webdev/PR-2
[WebDev] Bugfixes
2 parents 94437f2 + 1db2bf2 commit 9ae5bba

File tree

21 files changed

+245
-269
lines changed

21 files changed

+245
-269
lines changed

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="content">
11-
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main" name="adminhtml.catalog.product.set.edit" template="catalog/product/attribute/set/main.phtml"/>
11+
<container name="adminhtml.catalog.product.set.edit.wrapper" htmlTag="div" htmlClass="admin__scope-old"><!-- @todo ui: remove arguments within .admin__scope-old -->
12+
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main" name="adminhtml.catalog.product.set.edit" template="catalog/product/attribute/set/main.phtml"/>
13+
</container>
1214
</referenceContainer>
1315
</body>
1416
</page>

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -225,14 +225,6 @@
225225
</div>
226226
</fieldset>
227227
</div>
228-
229-
<button type="button"
230-
class="action-close"
231-
data-role="close-panel"
232-
title="<?= $block->escapeHtml(__('Close panel')) ?>">
233-
<span><?= /* @escapeNotVerified */ __('Close panel') ?></span>
234-
</button>
235-
<div class="image-pointer"></div>
236228
</div>
237229
</script>
238230

@@ -441,14 +433,6 @@
441433
</div>
442434
</fieldset>
443435
</div>
444-
445-
<button type="button"
446-
class="action-close"
447-
data-role="close-panel"
448-
title="<?= $block->escapeHtml(__('Close panel')) ?>">
449-
<span><?= /* @escapeNotVerified */ __('Close panel') ?></span>
450-
</button>
451-
<div class="image-pointer"></div>
452436
</div>
453437
</script>
454438

‎app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml

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

‎app/code/Magento/Shipping/view/adminhtml/web/js/packages.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/**
2+
* Copyright © 2015 Magento. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
define([
7+
'jquery',
8+
'Magento_Ui/js/modal/modal',
9+
'mage/translate'
10+
], function ($, modal, $t) {
11+
'use strict';
12+
13+
return function (config, element) {
14+
config.buttons = [
15+
{
16+
text: $t('Print'),
17+
'class': 'action action-primary',
18+
19+
/**
20+
* Click handler
21+
*/
22+
click: function () {
23+
window.location.href = this.options.url;
24+
}
25+
}, {
26+
text: $t('Cancel'),
27+
'class': 'action action-secondary',
28+
29+
/**
30+
* Click handler
31+
*/
32+
click: function () {
33+
this.closeModal();
34+
}
35+
}
36+
];
37+
modal(config, element);
38+
};
39+
});

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -361,16 +361,6 @@
361361
top: 5px;
362362
}
363363

364-
.image-pointer {
365-
background: url(../Magento_Backend/images/gallery-image-panel-corner.png) no-repeat;
366-
height: 15px;
367-
left: 50%;
368-
margin-left: -14px;
369-
position: absolute;
370-
top: -11px;
371-
width: 28px;
372-
}
373-
374364
.image-panel-controls,
375365
.image-panel-preview {
376366
float: left;
@@ -431,28 +421,6 @@
431421
width: 100%;
432422
}
433423

434-
.image-panel {
435-
.action-close {
436-
padding: 0;
437-
position: absolute;
438-
right: 29px;
439-
top: 17px;
440-
.lib-icon-font(
441-
@_icon-font-content: @icon-close-mage__content,
442-
@_icon-font: @icons-admin__font-name,
443-
@_icon-font-size: 2rem,
444-
@_icon-font-color: @color-brownie-vanilla,
445-
@_icon-font-color-hover: @color-brownie-vanilla
446-
);
447-
span {
448-
&:extend(.abs-visually-hidden all);
449-
}
450-
&:active {
451-
padding: 0;
452-
}
453-
}
454-
}
455-
456424
//
457425
// Custom Multiselect
458426
// _____________________________________________

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_navigation-bar.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
// ---------------------------------------------
4141

4242
.nav {
43+
.extend__clearer();
4344
background-color: @nav__background-color;
4445
border-bottom: 1px solid @nav__border-color;
4546
border-top: 1px solid @nav__border-color;
46-
.extend__clearer();
4747
display: none;
48+
margin-bottom: @nav-bar__indent-top;
4849
padding: @nav-bar-dot__size @nav__indent-right 0 0;
4950
}
5051

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
margin-left: -(@tooltip-arrow__size / 2);
5555
padding: 0 @tooltip-arrow__size;
5656
}
57+
p:last-child {
58+
margin-bottom: 0;
59+
}
5760
}
5861

5962
// Wrapper for the tooltip content

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@
113113
);
114114
color: @btn-prime__color;
115115
}
116-
&:active,
117-
&:focus {
116+
&:active {
118117
.lib-background-gradient(
119118
@_background-gradient: true,
120119
@_background-gradient-direction: horizontal,

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

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

6+
body:not([class]) {
7+
min-width: 0;
8+
}
69
.container {
710
display: block;
811
margin: 0 auto 4rem;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
// ---------------------------------------------
157157

158158
@container__width: 100rem;
159-
@container__indent: 2rem;
159+
@container__indent: 0;
160160

161161
@content__indent: @indent__l;
162162

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_readiness-check.less

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,20 @@
1010
// Sizes
1111

1212
@readiness-check-side__width: 22rem;
13-
@readiness-check-content__indent: 7.5rem;
13+
@readiness-check-content__indent: 5.7rem;
1414

1515
//
1616
// Common
1717
// ---------------------------------------------
1818

1919
.readiness-check-item {
2020
margin-bottom: 4rem;
21+
min-height: 2.5rem;
22+
.spinner {
23+
font-size: 2.5rem;
24+
float: left;
25+
margin: -.4rem 0 0 1.7rem;
26+
}
2127
}
2228

2329
.readiness-check-title {
@@ -49,7 +55,7 @@
4955

5056
.readiness-check-icon {
5157
float: left;
52-
margin-left: 2rem;
58+
margin-left: 1.7rem;
5359
margin-top: .7rem;
5460
}
5561

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
// Updater pages
9999
@import '../../../updater/styles/less/pages/_common.less';
100100
@import '../../../updater/styles/less/pages/_home.less';
101-
@import '../../../updater/styles/less/pages/_readiness-check.less';
102101
@import '../../../updater/styles/less/pages/_component-manager.less';
103102
@import '../../../updater/styles/less/pages/_login.less';
104103

‎app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_readiness-check.less

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

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,15 @@ option:empty {
176176
}
177177
}
178178

179+
//
180+
// Service text or control. Can be used to add text or "Use Default Value" checkbox
181+
// ---------------------------------------------
182+
183+
.admin__control-service {
184+
float: left;
185+
margin: .8rem 0 0 3rem;
186+
}
187+
179188
//
180189
// Textarea
181190
// ---------------------------------------------

‎lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,20 +194,20 @@ protected function _optionToHtml($option)
194194
{
195195
$id = $this->getHtmlId() . '_' . $this->_escape($option['value']);
196196

197-
$html = '<div class="field choice"><input id="' . $id . '"';
197+
$html = '<div class="field choice admin__field admin__field-option"><input id="' . $id . '"';
198198
foreach ($this->getHtmlAttributes() as $attribute) {
199199
if ($value = $this->getDataUsingMethod($attribute, $option['value'])) {
200-
$html .= ' ' . $attribute . '="' . $value . '"';
200+
$html .= ' ' . $attribute . '="' . $value . '" class="admin__control-checkbox"';
201201
}
202202
}
203203
$html .= ' value="' .
204204
$option['value'] .
205205
'" />' .
206206
' <label for="' .
207207
$id .
208-
'">' .
208+
'" class="admin__field-label"><span>' .
209209
$option['label'] .
210-
'</label></div>' .
210+
'</span></label></div>' .
211211
"\n";
212212
return $html;
213213
}

‎lib/internal/Magento/Framework/Data/Form/Element/Note.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function getElementHtml()
3939
$html = $this->getBeforeElementHtml()
4040
. '<div id="'
4141
. $this->getHtmlId()
42-
. '" class="control-value">'
42+
. '" class="control-value admin__field-value">'
4343
. $this->getText()
4444
. '</div>'
4545
. $this->getAfterElementHtml();

‎lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testGetElementHtml()
6363
$this->_model->setValue('Note Text');
6464
$html = $this->_model->getElementHtml();
6565
$this->assertEquals(
66-
"note_before<div id=\"note_id\" class=\"control-value\"></div>note_after",
66+
"note_before<div id=\"note_id\" class=\"control-value admin__field-value\"></div>note_after",
6767
$html
6868
);
6969
}

‎setup/pub/styles/setup.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎setup/view/magento/setup/home.phtml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@
66
?>
77

88
<section class="home-page-inner-wrap ng-scope">
9-
<p class="upgrade-home-title">
9+
<p class="setup-home-title">
1010
Welcome to the Magento Setup Tool. Please choose a task below.
1111
</p>
1212

1313
<div class="row" style="padding-left: 145px;" >
1414
<div class="col-m-4">
15-
<a href="" class="upgrade-home-item upgrade-home-item-component" ui-sref="root.update">
16-
<span class="upgrade-home-item-title">Component Manager</span>
17-
<span class="upgrade-home-item-description">I want to manage my packages and modules.</span>
15+
<a href="" class="setup-home-item setup-home-item-component" ui-sref="root.update">
16+
<span class="setup-home-item-title">Component Manager</span>
17+
<span class="setup-home-item-description">I want to manage my packages and modules.</span>
1818
</a>
1919
</div>
2020
<div class="col-m-4">
21-
<a href="" class="upgrade-home-item upgrade-home-item-upgrade" ui-sref="root.upgrade">
22-
<span class="upgrade-home-item-title">System Upgrade</span>
23-
<span class="upgrade-home-item-description">I want to upgrade my Magento Admin version.</span>
21+
<a href="" class="setup-home-item setup-home-item-upgrade" ui-sref="root.upgrade">
22+
<span class="setup-home-item-title">System Upgrade</span>
23+
<span class="setup-home-item-description">I want to upgrade my Magento Admin version.</span>
2424
</a>
2525
</div>
2626
<div class="col-m-4">
27-
<a href="" class="upgrade-home-item upgrade-home-item-configuration" ui-sref="root.system-config">
28-
<span class="upgrade-home-item-title">System Configuration</span>
29-
<span class="upgrade-home-item-description">I want to change my Magento system configurations.</span>
27+
<a href="" class="setup-home-item setup-home-item-configuration" ui-sref="root.system-config">
28+
<span class="setup-home-item-title">System Configuration</span>
29+
<span class="setup-home-item-description">I want to change my Magento system configurations.</span>
3030
</a>
3131
</div>
3232
</div>

‎setup/view/magento/setup/navigation/menu.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
</head>
1919

20-
<div>
21-
<nav ng-controller="navigationController" id="menu" class="nav ng-scope show"
20+
21+
<nav ng-controller="navigationController" id="menu" class="nav ng-scope show"
2222
ng-hide="$state.current.noMenu || $state.current.main || $state.current.default">
2323
<ul class="nav-bar">
2424
<li ng-repeat="menuState in menu | filter: {type: $state.current.type}:true"
@@ -29,4 +29,4 @@
2929
</li>
3030
</ul>
3131
</nav>
32-
</div>
32+

‎setup/view/magento/setup/select-version.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*/
66
?>
77

8-
<h2 class="page-title">{{$state.current.header}}</h2>
9-
108
<div class="nav-bar-outer-actions">
119

1210
<div class="outer-actions-inner-wrap">
@@ -30,6 +28,8 @@
3028
</div>
3129
</div>
3230

31+
<h2 class="page-sub-title">{{$state.current.header}}</h2>
32+
3333
<div class="row form-row">
3434
<div class="message message-spinner" ng-show="!upgradeProcessed">
3535
<span class="spinner">

0 commit comments

Comments
 (0)