From b5aac653b88eb280d5e90685d3925cdc26a8c2db Mon Sep 17 00:00:00 2001 From: NamrataChangani <37930646+NamrataChangani@users.noreply.github.com> Date: Fri, 30 Mar 2018 18:18:00 +0530 Subject: [PATCH 1/9] Correct function return statement. --- app/code/Magento/Security/Model/AdminSessionInfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Security/Model/AdminSessionInfo.php b/app/code/Magento/Security/Model/AdminSessionInfo.php index 1aeb1b671c5cf..77d864965baca 100644 --- a/app/code/Magento/Security/Model/AdminSessionInfo.php +++ b/app/code/Magento/Security/Model/AdminSessionInfo.php @@ -164,7 +164,7 @@ public function isOtherSessionsTerminated() * Setter for isOtherSessionsTerminated * * @param bool $isOtherSessionsTerminated - * @return this + * @return $this * @since 100.1.0 */ public function setIsOtherSessionsTerminated($isOtherSessionsTerminated) From 22345400251086949794e8cccf64aa09788f9075 Mon Sep 17 00:00:00 2001 From: NamrataChangani <37930646+NamrataChangani@users.noreply.github.com> Date: Fri, 30 Mar 2018 18:18:47 +0530 Subject: [PATCH 2/9] Correct function return statement. --- app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php index 15f87931886c8..55e1d319cc776 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php @@ -74,7 +74,7 @@ protected function _initRule() /** * Initiate action * - * @return this + * @return $this */ protected function _initAction() { From b53e6b9eed78bd164139a8a1d11498c592e61f96 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Fri, 18 May 2018 14:30:35 +0530 Subject: [PATCH 3/9] Fixed typo mistake in function comment --- app/code/Magento/Theme/Model/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Theme/Model/Config.php b/app/code/Magento/Theme/Model/Config.php index 57efe43db3d7c..bbf9677afdcb2 100644 --- a/app/code/Magento/Theme/Model/Config.php +++ b/app/code/Magento/Theme/Model/Config.php @@ -124,7 +124,7 @@ protected function _getAssignedScopesCollection($scope, $configPath) } /** - * Unassign given theme from stores that were unchecked + * Unassigned given theme from stores that were unchecked * * @param string $themeId * @param array $stores From f8f0f37b1f79d8cf38699869903825417d6a6c94 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Fri, 18 May 2018 16:21:11 +0530 Subject: [PATCH 4/9] Removed extra added space in function comment and fixed typo mistakes. --- app/code/Magento/Paypal/Model/Api/Nvp.php | 6 +++--- .../blank/Magento_ProductVideo/web/css/source/_module.less | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php index 6933c613ef748..25883590350f4 100644 --- a/app/code/Magento/Paypal/Model/Api/Nvp.php +++ b/app/code/Magento/Paypal/Model/Api/Nvp.php @@ -1025,7 +1025,7 @@ public function callGetPalDetails() } /** - * Set Customer BillingA greement call + * Set Customer BillingAgreement call * * @return void * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetCustomerBillingAgreement @@ -1425,7 +1425,7 @@ protected function _deformatNVP($nvpstr) $nvpstr = strpos($nvpstr, "\r\n\r\n") !== false ? substr($nvpstr, strpos($nvpstr, "\r\n\r\n") + 4) : $nvpstr; while (strlen($nvpstr)) { - //postion of Key + //position of Key $keypos = strpos($nvpstr, '='); //position of value $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr); @@ -1433,7 +1433,7 @@ protected function _deformatNVP($nvpstr) /*getting the Key and Value values and storing in a Associative Array*/ $keyval = substr($nvpstr, $intial, $keypos); $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1); - //decoding the respose + //decoding the response $nvpArray[urldecode($keyval)] = urldecode($valval); $nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr)); } diff --git a/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less index 023c531545963..3dce80ff4d605 100644 --- a/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less @@ -97,8 +97,8 @@ // @TODO UI: check possibility to use .media-width() mixin @media only screen -and (min-device-width: 320px) -and (max-device-width: 780px) +and (min-device-width: @screen__xxs) +and (max-device-width: @screen__m) and (orientation: landscape) { .product-video { height: 100%; From c964565bbe179a22d96f63f51463a5535193fb6b Mon Sep 17 00:00:00 2001 From: Namrata <37930646+NamrataChangani@users.noreply.github.com> Date: Fri, 18 May 2018 16:34:59 +0530 Subject: [PATCH 5/9] Revert back file changes --- .../blank/Magento_ProductVideo/web/css/source/_module.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less index 3dce80ff4d605..023c531545963 100644 --- a/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_ProductVideo/web/css/source/_module.less @@ -97,8 +97,8 @@ // @TODO UI: check possibility to use .media-width() mixin @media only screen -and (min-device-width: @screen__xxs) -and (max-device-width: @screen__m) +and (min-device-width: 320px) +and (max-device-width: 780px) and (orientation: landscape) { .product-video { height: 100%; From 6913345ce32ee407641a133133ec2a4667220c2f Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Fri, 18 May 2018 17:26:18 +0530 Subject: [PATCH 6/9] Revert back file changes. --- app/code/Magento/Theme/Model/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Theme/Model/Config.php b/app/code/Magento/Theme/Model/Config.php index bbf9677afdcb2..57efe43db3d7c 100644 --- a/app/code/Magento/Theme/Model/Config.php +++ b/app/code/Magento/Theme/Model/Config.php @@ -124,7 +124,7 @@ protected function _getAssignedScopesCollection($scope, $configPath) } /** - * Unassigned given theme from stores that were unchecked + * Unassign given theme from stores that were unchecked * * @param string $themeId * @param array $stores From f4912a2e6ed01ec731f83d53ddaff92a63f8db7e Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Sat, 16 Jun 2018 09:49:34 +0530 Subject: [PATCH 7/9] Removed unnecessary blank line from xml. --- app/code/Magento/Catalog/etc/adminhtml/menu.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Catalog/etc/adminhtml/menu.xml b/app/code/Magento/Catalog/etc/adminhtml/menu.xml index aa910e6d5ade4..cfcce3a26cbec 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/menu.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/menu.xml @@ -12,7 +12,6 @@ - From b01a948421311e4fbb99ceb9d6bc38317bccacb5 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Sat, 16 Jun 2018 09:57:40 +0530 Subject: [PATCH 8/9] Fixed syntax for before-after operators in less files. --- .../setup/styles/less/lib/forms/_checkbox-radio.less | 2 +- .../updater/styles/less/components/_data-grid.less | 12 ++++++------ .../css/source/module/checkout/_authentication.less | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less index 44b6a1568ef9b..82a6f7b2f19bd 100644 --- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less +++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less @@ -87,7 +87,7 @@ .form-el-checkbox { &:checked { + .form-label { - &::before { + &:before { content: @checkbox-icon__content; font-family: @icons__font-family; } diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less index 2e8f06c091265..313efe6cdbc13 100644 --- a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less +++ b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less @@ -22,8 +22,8 @@ vertical-align: middle; width: @component-indicator__size; - &::before, - &::after { + &:before, + &:after { background: @color-white; display: block; opacity: 0; @@ -32,7 +32,7 @@ visibility: hidden; } - &::before { + &:before { border: 1px solid @color-gray68; border-radius: 1px; box-shadow: 0 0 2px rgba(0,0,0,.4); @@ -43,7 +43,7 @@ padding: 4px 5px; } - &::after { + &:after { border-color: darken(@color-gray68, 8); border-style: solid; border-width: 1px 0 0 1px; @@ -56,8 +56,8 @@ } &:hover { - &::before, - &::after { + &:before, + &:after { opacity: 1; transition: opacity .2s linear; visibility: visible; diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less index e1e23a9ffbb15..f583c5dae0cc8 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less @@ -94,7 +94,7 @@ padding-top: @indent__xl; position: relative; - &::before { + &:before { .lib-css(height, @block-auth__or-label__size); .lib-css(line-height, @block-auth__or-label__size - 2px); .lib-css(margin, -(@block-auth__or-label__size/2 + 1px) 0 0 -(@block-auth__or-label__size / 2)); @@ -212,7 +212,7 @@ margin: 0; padding: @indent__s 0 0 @indent__xl; - &::before { + &:before { left: 0; top: 50%; } From 010b16fe96b27b3b6f500a1d1b09310ab40cbdb0 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Sat, 16 Jun 2018 10:34:10 +0530 Subject: [PATCH 9/9] Correct sentence in comment section in class file. --- setup/src/Magento/Setup/Fixtures/OrdersFixture.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php index 1acad6dbc1787..9fbec3b3741b2 100644 --- a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php +++ b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php @@ -14,7 +14,7 @@ * Optionally generates inactive quotes for generated orders. * * Support the following format: - * + * * {bool} * *