Skip to content

[Fowardport] Correct sentence in comment section in class file. #16320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 25, 2018
Merged

[Fowardport] Correct sentence in comment section in class file. #16320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b5aac65
Correct function return statement.
sanganinamrata Mar 30, 2018
2234540
Correct function return statement.
sanganinamrata Mar 30, 2018
b53e6b9
Fixed typo mistake in function comment
sanganinamrata May 18, 2018
f8f0f37
Removed extra added space in function comment and fixed typo mistakes.
sanganinamrata May 18, 2018
c964565
Revert back file changes
sanganinamrata May 18, 2018
6913345
Revert back file changes.
sanganinamrata May 18, 2018
af0c159
Merge pull request #1 from NamrataChangani/2.3-develop-PR-port-15302
sanganinamrata Jun 5, 2018
1a76cdb
Merge pull request #2 from NamrataChangani/2.3-develop-PR-port-15795
sanganinamrata Jun 7, 2018
083447a
Merge pull request #3 from NamrataChangani/2.3-develop-PR-port-15825
sanganinamrata Jun 7, 2018
f4912a2
Removed unnecessary blank line from xml.
sanganinamrata Jun 16, 2018
b01a948
Fixed syntax for before-after operators in less files.
sanganinamrata Jun 16, 2018
010b16f
Correct sentence in comment section in class file.
sanganinamrata Jun 16, 2018
057a6b7
Merge pull request #6 from NamrataChangani/2.3-develop-PR-port-16181
sanganinamrata Jun 22, 2018
5a7d18d
Merge pull request #4 from NamrataChangani/2.3-develop-PR-port-16183
sanganinamrata Jun 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/code/Magento/Catalog/etc/adminhtml/menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<add id="Magento_Catalog::catalog_categories" title="Categories" translate="title" module="Magento_Catalog" sortOrder="20" parent="Magento_Catalog::inventory" action="catalog/category/" resource="Magento_Catalog::categories"/>
<add id="Magento_Catalog::catalog_attributes_attributes" title="Product" translate="title" module="Magento_Catalog" sortOrder="30" parent="Magento_Backend::stores_attributes" action="catalog/product_attribute/" resource="Magento_Catalog::attributes_attributes"/>
<add id="Magento_Catalog::catalog_attributes_sets" title="Attribute Set" translate="title" module="Magento_Catalog" sortOrder="40" parent="Magento_Backend::stores_attributes" action="catalog/product_set/" resource="Magento_Catalog::sets"/>

<add id="Magento_Catalog::inventory" title="Inventory" translate="title" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::catalog" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
</menu>
</config>
2 changes: 1 addition & 1 deletion ...design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
.form-el-checkbox {
&:checked {
+ .form-label {
&::before {
&:before {
content: @checkbox-icon__content;
font-family: @icons__font-family;
}
Expand Down
12 changes: 6 additions & 6 deletions app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
vertical-align: middle;
width: @component-indicator__size;

&::before,
&::after {
&:before,
&:after {
background: @color-white;
display: block;
opacity: 0;
Expand All @@ -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);
Expand All @@ -43,7 +43,7 @@
padding: 4px 5px;
}

&::after {
&:after {
border-color: darken(@color-gray68, 8);
border-style: solid;
border-width: 1px 0 0 1px;
Expand All @@ -56,8 +56,8 @@
}

&:hover {
&::before,
&::after {
&:before,
&:after {
opacity: 1;
transition: opacity .2s linear;
visibility: visible;
Expand Down
4 changes: 2 additions & 2 deletions ...ontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -212,7 +212,7 @@
margin: 0;
padding: @indent__s 0 0 @indent__xl;

&::before {
&:before {
left: 0;
top: 50%;
}
Expand Down
2 changes: 1 addition & 1 deletion setup/src/Magento/Setup/Fixtures/OrdersFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Optionally generates inactive quotes for generated orders.
*
* Support the following format:
* <!-- Is is nescessary to enable quotes for orders -->
* <!-- It is necessary to enable quotes for orders -->
* <order_quotes_enable>{bool}</order_quotes_enable>
*
* <!-- Min number of simple products per each order -->
Expand Down