Skip to content

Commit 6f7c874

Browse files
Merge pull request #11 from hitesh-wagento/2.1-develop-PR-port-15914
[Backport] [Resolved : Changing @tab-content__border variable has no effect in B…
2 parents 2f13af3 + 5b34517 commit 6f7c874

File tree

11 files changed

+28
-13
lines changed

11 files changed

+28
-13
lines changed

app/code/Magento/Backend/App/AbstractAction.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
214214
$this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
215215
$this->_view->renderLayout();
216216
$this->_request->setDispatched(true);
217+
217218
return $this->_response;
218219
}
219220

@@ -223,6 +224,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
223224

224225
$this->_processLocaleSettings();
225226

227+
// Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
228+
if ($this->_auth->isLoggedIn()) {
229+
$this->_auth->getAuthStorage()->isFirstPageAfterLogin();
230+
}
231+
226232
return parent::dispatch($request);
227233
}
228234

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ define([
3333

3434
_bindSubmit: function() {
3535
var self = this;
36+
if (this.element.data('catalog-addtocart-initialized')) {
37+
return;
38+
}
39+
this.element.data('catalog-addtocart-initialized', 1);
3640
this.element.on('submit', function(e) {
3741
e.preventDefault();
3842
self.submitForm($(this));

app/code/Magento/Customer/Controller/Section/Load.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public function execute()
6161
{
6262
/** @var \Magento\Framework\Controller\Result\Json $resultJson */
6363
$resultJson = $this->resultJsonFactory->create();
64+
$resultJson->setHeader('Cache-Control', 'max-age=0, must-revalidate, no-cache, no-store', true);
65+
$resultJson->setHeader('Pragma', 'no-cache', true);
6466
try {
6567
$sectionNames = $this->getRequest()->getParam('sections');
6668
$sectionNames = $sectionNames ? array_unique(\explode(',', $sectionNames)) : null;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ define([
104104
* @param {String|Number} recordId
105105
*/
106106
deleteRecord: function (index, recordId) {
107-
this._super();
108-
109107
this.updateInsertData(recordId);
108+
this._super();
110109
},
111110

112111
/**

app/code/Magento/Wishlist/Block/Rss/EmailLink.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class EmailLink extends Link
2222
protected $_template = 'rss/email.phtml';
2323

2424
/**
25-
* @return string
25+
* @return array
2626
*/
2727
protected function getLinkParams()
2828
{

app/code/Magento/Wishlist/Block/Rss/Link.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function isRssAllowed()
6969
}
7070

7171
/**
72-
* @return string
72+
* @return array
7373
*/
7474
protected function getLinkParams()
7575
{

app/code/Magento/Wishlist/Helper/Data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ public function isAllowInCart()
500500
/**
501501
* Retrieve customer name
502502
*
503-
* @return string|void
503+
* @return string|null
504504
*/
505505
public function getCustomerName()
506506
{

app/design/frontend/Magento/blank/web/css/source/_sections.less

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020

2121
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
2222
.product.data.items {
23-
.lib-data-tabs(
24-
@_tab-content-border-top-status: true
25-
);
23+
.lib-data-tabs();
2624
}
2725
}
2826

app/design/frontend/Magento/blank/web/css/source/_variables.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
@font-family-name__base: 'Open Sans';
1616
@font-family__base: @font-family-name__base, @font-family__sans-serif;
1717

18+
//
19+
// Sections variables
20+
// _____________________________________________
21+
22+
//
23+
// Tabs
24+
// ---------------------------------------------
25+
@tab-content__border-top-status: true;
26+
27+
1828
//
1929
// Sidebar
2030
// ---------------------------------------------

app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
&:last-child {
2323
margin-bottom: 0;
2424
}
25-
26-
&.primary {
27-
// &:extend(.abs-button-l all);
28-
}
2925
}
3026

3127
&:last-child {

0 commit comments

Comments
 (0)