Skip to content

[WIP] Fixes some wrong usages of ignoring coding standards in less files. #38012

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

Draft
wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Draft

[WIP] Fixes some wrong usages of ignoring coding standards in less files. #38012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions app/design/adminhtml/Magento/backend/Magento_Analytics/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
}

.advanced-reports-subscription-modal {
h1:first-of-type {
h1::first-of-type {
background: url("Magento_Analytics::images/analytics-icon.svg") no-repeat;
background-size: 55px 49.08px;
padding: 1.5rem 0 2rem 7rem;
Expand Down Expand Up @@ -158,13 +158,12 @@
margin-top: 1rem;
}

/**
* @codingStandardsIgnoreStart
*/
/* @codingStandardsIgnoreStart */
#row_analytics_general_vertical {
>td.config-vertical-label {
>label.admin__field-label {
padding-right: 0;
}
}
}
/* @codingStandardsIgnoreEnd */
8 changes: 1 addition & 7 deletions app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@
// Utilities
// ---------------------------------------------

/**
* @codingStandardsIgnoreStart
*/

.admin__menu-link() {
color: @menu-item__color;
display: block;
Expand Down Expand Up @@ -161,9 +157,7 @@

.logo-img {
height: @menu-logo-img__height;
transition: -webkit-filter .2s linear,
filter .2s linear,
transform .1s linear;
transition: -webkit-filter .2s linear, filter .2s linear, transform .1s linear;
width: @menu-logo-img__width;
}
}
Expand Down
19 changes: 8 additions & 11 deletions app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,19 @@
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.rma-request-details,
.rma-wrapper .order-shipping-address {
float: left;
/**
* @codingStandardsIgnoreStart
*/
/* @codingStandardsIgnoreStart */
#mix-grid .width(6, 12);
//@codingStandardsIgnoreEnd
/* @codingStandardsIgnoreEnd */
float: left;
}

.rma-confirmation,
.rma-wrapper .order-return-address, .rma-wrapper .order-shipping-method {
float: right;
/**
* @codingStandardsIgnoreStart
*/
.rma-wrapper .order-return-address,
.rma-wrapper .order-shipping-method {
/* @codingStandardsIgnoreStart */
#mix-grid .width(6, 12);
//@codingStandardsIgnoreEnd
/* @codingStandardsIgnoreEnd */
float: right;
}
}

Expand Down
4 changes: 0 additions & 4 deletions app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
// * See COPYING.txt for license details.
// */

/**
* @codingStandardsIgnoreStart
*/
.block-footer .action-add {
-webkit-appearance: none;
&:extend(.action-default, button all);
Expand Down Expand Up @@ -40,4 +37,3 @@
}
}
}
//@codingStandardsIgnoreEnd
5 changes: 1 addition & 4 deletions app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
// _____________________________________________

// Data Grid Change Indicator
/**
* @codingStandardsIgnoreStart
*/
@data-grid-row-changed__icon: @icon-edit__content;
@data-grid-row-changed-tooltip__background: @color-white-fog2;

Expand Down Expand Up @@ -1088,7 +1085,7 @@ body._in-resize {

// Content Hierarchy specific
.adminhtml-cms-hierarchy-index & {
.data-grid-actions-cell:first-child {
.data-grid-actions-cell::first-child {
padding: 0;
}
}
Expand Down
13 changes: 5 additions & 8 deletions app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,12 @@
width: auto;
z-index: 1;

/**
* @codingStandardsIgnoreStart
*/
&:hover {
&:extend(.abs-form-control-pattern:hover);
&:extend(.abs-form-control-pattern::hover);
}

&._focus {
&:extend(.abs-form-control-pattern:focus);
&:extend(.abs-form-control-pattern::focus);
}

&._active {
Expand Down Expand Up @@ -261,7 +258,7 @@

.selectmenu:hover & {
&:before {
&:extend(.abs-form-control-pattern:hover);
&:extend(.abs-form-control-pattern::hover);
}
}

Expand All @@ -270,7 +267,7 @@
}

.selectmenu._focus &:before {
&:extend(.abs-form-control-pattern:focus);
&:extend(.abs-form-control-pattern::focus);
}

body._keyfocus &:focus {
Expand Down Expand Up @@ -355,7 +352,7 @@
white-space: nowrap;
z-index: 1;

li:last-child & {
li::last-child & {
padding-right: .4rem;
}

Expand Down
3 changes: 0 additions & 3 deletions app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
// Variables
// _____________________________________________

/**
* @codingStandardsIgnoreStart
*/
@action-multiselect-menu-item__padding: 1rem;
@action-multiselect-menu-item__hover__background-color: @color-gray89;
@action-multiselect-menu-item__selected__background-color: @color-blue-clear-sky;
Expand Down
6 changes: 2 additions & 4 deletions app/design/adminhtml/Magento/backend/web/css/source/components/_media-gallery.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,15 @@
height: @image-gallery-placeholder__height;

.product-image-wrapper {
/**
* @codingStandardsIgnoreStart
*/
/* @codingStandardsIgnoreStart */
.lib-icon-font(
@icon-camera__content,
@_icon-font: @icons-admin__font-name,
@_icon-font-size: @image-gallery-placeholder-icon__size,
@_icon-font-color: @image-gallery-placeholder-icon__color,
@_icon-font-text-hide: true
);
//@codingStandardsIgnoreEnd
/* @codingStandardsIgnoreEnd */

&:before {
left: 0;
Expand Down
19 changes: 9 additions & 10 deletions app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
width: auto;
}

/* @codingStandardsIgnoreStart */
.__form-control-pattern__hover() {
border-color: @field-control__hover__border-color;
}
Expand All @@ -48,6 +49,7 @@
cursor: not-allowed;
opacity: @disabled__opacity;
}
/* @codingStandardsIgnoreEnd */

// Input text styles
.admin__control-text {
Expand Down Expand Up @@ -134,12 +136,9 @@ option:empty {
&:before {
&:extend(.abs-form-control-pattern);

.admin__control-file:active + &,
.admin__control-file:focus + & {
/**
* @codingStandardsIgnoreStart
*/
&:extend(.abs-form-control-pattern:focus);
.admin__control-file::active + &,
.admin__control-file::focus + & {
&:extend(.abs-form-control-pattern::focus);
}

.admin__control-file[disabled] + & {
Expand Down Expand Up @@ -168,14 +167,14 @@ option:empty {
// Support text. Can be used on label or plain text to align controls & actions
// ---------------------------------------------

.admin__control-support-text { // ToDo UI: should be renamed to .admin__control-text
.admin__control-support-text { /* ToDo UI: should be renamed to .admin__control-text */
border: @field-control__border-width solid transparent;
display: inline-block;
font-size: @field-control__font-size;
line-height: @field-control__line-height;
margin-left: @action__outer-indent;
padding-bottom: @field-control__padding-bottom;
padding-top: @field-control__padding-top;
margin-left: @action__outer-indent;

+ [class*='admin__control-'] {
margin-left: @action__outer-indent;
Expand Down Expand Up @@ -288,11 +287,11 @@ option:empty {
}

&:focus ~ [class*='admin__addon-']:last-child:before {
&:extend(.abs-form-control-pattern:focus);
&:extend(.abs-form-control-pattern::focus);
}

&:hover ~ [class*='admin__addon-']:last-child:before {
&:extend(.abs-form-control-pattern:hover);
&:extend(.abs-form-control-pattern::hover);
}
}
}
Expand Down
28 changes: 17 additions & 11 deletions app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,9 @@
}

.abs-field-no-label {
/**
*@codingStandardsIgnoreStart
*/
/* @codingStandardsIgnoreStart */
#mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');
//@codingStandardsIgnoreEnd
/* @codingStandardsIgnoreEnd */
margin-left: @_length;
}

Expand Down Expand Up @@ -121,7 +119,7 @@

> .admin__field-control {
#mix-grid .column(@field-control-grid__column, @field-grid__columns);
input[type="checkbox"] {
input[type='checkbox'] {
margin-top: @indent__s;
}
}
Expand Down Expand Up @@ -191,9 +189,11 @@
.admin__control-textarea {
width: 100%;
&.disabled {
/* @codingStandardsIgnoreStart */
background-color: #e9e9e9;
border-color: #adadad;
color: #303030;
/* @codingStandardsIgnoreEnd */
cursor: not-allowed;
opacity: .5;
}
Expand Down Expand Up @@ -235,7 +235,9 @@
white-space: nowrap;

&:before {
/* @codingStandardsIgnoreStart */
.appearing__off();
/* @codingStandardsIgnoreEnd */
content: '.';
margin-left: -7px;
overflow: hidden;
Expand Down Expand Up @@ -328,7 +330,9 @@
// Till that time they'll be disabled by commenting pseudo-element content property.
&[data-config-scope] {
&:before {
/* @codingStandardsIgnoreStart */
#mix-grid .return_length(@field-label-grid__column + @field-control-grid__column, @field-grid__columns);
/* @codingStandardsIgnoreEnd */
color: @field-scope__color;
content: attr(data-config-scope);
display: inline-block;
Expand All @@ -349,8 +353,8 @@
}

&._error {
.admin__field-control [class*='admin__control-'] [class*='admin__addon-']:before,
.admin__field-control [class*='admin__addon-']:before,
.admin__field-control [class*='admin__control-'] [class*='admin__addon-']::before,
.admin__field-control [class*='admin__addon-']::before,
.admin__field-control > [class*='admin__control-'] {
border-color: @field-error-control__border-color;
}
Expand All @@ -364,9 +368,11 @@
outline: inherit;

.admin__action-multiselect-wrap {
/* @codingStandardsIgnoreStart */
.admin__action-multiselect {
.__form-control-pattern__disabled();
}
/* @codingStandardsIgnoreEnd */
}
}

Expand Down Expand Up @@ -620,7 +626,7 @@
&.admin__field-large {
width: 1px;

+ .admin__field:last-child {
+ .admin__field::last-child {
width: auto;
}
}
Expand Down Expand Up @@ -666,8 +672,8 @@
&.admin__field {
> .admin__field-control {
&:extend(.abs-field-size-small all);
position: relative;
display: inline-block;
position: relative;
}
}

Expand Down Expand Up @@ -763,7 +769,7 @@
margin: @indent__s 0 @indent__l;
padding-left: @indent__s;

.admin__field:not(._hidden) + & {
.admin__field::not(._hidden) + & {
margin-top: 3rem;
}

Expand Down Expand Up @@ -809,7 +815,7 @@
// _____________________________________________

.admin__legend {
// ToDo UI: add form legend styles. Check if they doon't conflict with create order page form legend styles
/* ToDo UI: add form legend styles. Check if they doon't conflict with create order page form legend styles */
float: left;
position: static;
width: 100%;
Expand Down
Loading