Skip to content
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

[Backport] Fixes white color coding standard. #17015

Merged
merged 1 commit into from
Jul 23, 2018
Merged

[Backport] Fixes white color coding standard. #17015

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
6 changes: 3 additions & 3 deletions app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
display: inline-block;
vertical-align: top;
width: 100%;
background-color: #fff;
background-color: @color-white;
border: 1px solid #ada89e;
border-radius: 2px;

Expand Down Expand Up @@ -72,7 +72,7 @@
top: 100%;
margin: 1px -1px 0 -1px;
border: 1px solid #cac2b5;
background: #fff;
background: @color-white;
box-shadow: 0 2px 4px rgba(0, 0, 0, .2);
z-index: 990;

Expand Down Expand Up @@ -229,7 +229,7 @@

> input.ui-autocomplete-loading,
> input.mage-suggest-state-loading {
background: #fff url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
background: @color-white url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}

.attribute-change-checkbox {
background: #fff;
background: @color-white;
display: block;
margin-top: 5px;

Expand Down
6 changes: 3 additions & 3 deletions ...ign/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
);

.action.toggle {
background: #fff;
background: @color-white;
border-radius: 0 1px 1px 0;
border: 1px solid #ada89e;
height: 33px;
Expand Down Expand Up @@ -58,7 +58,7 @@
.action.toggle {
padding: 0 3px;
border: 1px solid #b7b2a7;
background: #fff;
background: @color-white;
border-radius: 0 1px 1px 0;
border-left: none;
height: 50px;
Expand Down Expand Up @@ -121,7 +121,7 @@
width: auto;

.addafter {
background: #fff;
background: @color-white;
border-width: 1px 0 1px 1px;
direction: ltr;
height: 33px;
Expand Down
2 changes: 1 addition & 1 deletion app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
.invitee_information .data-table tbody tr th,
.inviter_information .data-table tbody tr td,
.inviter_information .data-table tbody tr th {
background-color: #fff;
background-color: @color-white;
border: 0;
color: #666;
padding: 9px 10px 10px;
Expand Down
2 changes: 1 addition & 1 deletion app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

&.ui-state-active {
z-index: 2;
background: #FFF;
background: @color-white;
padding: 1px (@spacing-m - 1px);
border: 2px solid #eb5202;
margin: -1px;
Expand Down
40 changes: 20 additions & 20 deletions app/design/adminhtml/Magento/backend/web/css/styles-old.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@
right: 0;
top: 100%;
border: 1px solid #cac2b5;
background: #fff;
background: @color-white;
box-shadow: 0 1px 1px rgba(0, 0, 0, .2);
z-index: 990;
}
Expand Down Expand Up @@ -789,7 +789,7 @@
border-radius: 1px;
padding: 4px;
color: #303030;
background-color: #fff;
background-color: @color-white;
font-weight: 500;
font-size: 14px;
height: 33px;
Expand Down Expand Up @@ -863,7 +863,7 @@
input[type="radio"],
input[type="checkbox"] {
.lib-css(appearance, none, 1);
background: #fff;
background: @color-white;
border-radius: 2px;
border: 1px solid #adadad;
cursor: pointer;
Expand Down Expand Up @@ -948,7 +948,7 @@
}

select[disabled] option[selected] {
color: #fff;
color: @color-white;
background: #aaa;
}

Expand Down Expand Up @@ -1160,7 +1160,7 @@

.fieldset-wrapper,
.fieldset {
background: #fff;
background: @color-white;
border: 0;
margin: 0;
padding: 5px 0 38px;
Expand Down Expand Up @@ -1578,7 +1578,7 @@

.multiselect-alt .item {
position: relative;
border-top: 1px solid #fff;
border-top: 1px solid @color-white;
cursor: pointer;
}

Expand Down Expand Up @@ -1655,7 +1655,7 @@

~ .addafter strong {
display: inline-block;
background: #fff;
background: @color-white;
line-height: 24px;
margin: 0 3px 0 0;
padding-left: 4px;
Expand Down Expand Up @@ -2045,7 +2045,7 @@
&:before {
position: absolute;
content: "";
background-color: #fff;
background-color: @color-white;
right: 0;
top: 0;
bottom: 0;
Expand Down Expand Up @@ -2302,7 +2302,7 @@
// --------------------------------------

.preview-window {
background: #fff;
background: @color-white;
}

.preview-window .toolbar {
Expand Down Expand Up @@ -2462,7 +2462,7 @@
}

.attribute-popup .page-actions.fixed .page-actions-inner {
background: #fff;
background: @color-white;
padding: 0;
min-width: 100%;
max-width: 100%;
Expand Down Expand Up @@ -2761,7 +2761,7 @@
border: 1px solid #c9c2b8;
border-width: 0 0 1px;
padding: 6px 10px 7px;
background: #fff;
background: @color-white;
.style2();

span {
Expand All @@ -2773,7 +2773,7 @@
td {
border: none;
padding: 6px 10px 7px;
background: #fff;
background: @color-white;
}

tr:last-child td {
Expand Down Expand Up @@ -2862,7 +2862,7 @@

.table-fieldset-alt tbody tr:nth-child(odd) td,
.table-fieldset-alt tbody tr:nth-child(odd):hover td {
background: #fff;
background: @color-white;
}

//
Expand Down Expand Up @@ -2922,7 +2922,7 @@
}

.order-details-existing-customer {
background: #fff;
background: @color-white;
padding-left: 0;
position: relative;
width: 77.9%;
Expand Down Expand Up @@ -3039,7 +3039,7 @@
}

.gift-options-tooltip {
background: #fff;
background: @color-white;
border-radius: 5px;
padding: 10px;
box-shadow: 0 0 3px rgba(0, 0, 0, .3);
Expand Down Expand Up @@ -3198,7 +3198,7 @@
left: 0;
margin: 0 8px;
padding: 10px;
background: #fff;
background: @color-white;
}
}

Expand Down Expand Up @@ -3390,7 +3390,7 @@

.rma-popup,
.cms-popup {
background: #fff;
background: @color-white;
box-shadow: 0 3px 6px rgba(0, 0, 0, .4);
cursor: default;
position: fixed;
Expand All @@ -3414,7 +3414,7 @@
}

.rma-popup .content {
background: #fff;
background: @color-white;
border-bottom: 1px solid #ccc;
max-height: 400px;
overflow: auto;
Expand Down Expand Up @@ -3471,7 +3471,7 @@
.grid .rma-popup .form-list tr,
.grid tr.even .rma-popup .form-list tr,
.grid tr.on-mouse .rma-popup .form-list tr {
background: #fff !important;
background: @color-white !important;
}

//
Expand Down Expand Up @@ -3885,7 +3885,7 @@
.defaultSkin {
table.mceLayout {
td {
background: #fff;
background: @color-white;
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ td.col-type {
position: relative;
border-bottom-right-radius: 0;
box-shadow: none;
background: #fff;
background: @color-white;

&:after {
position: absolute;
Expand All @@ -369,7 +369,7 @@ td.col-type {
right: 0;
height: 2px;
margin-top: -1px;
background: #fff;
background: @color-white;
content: '';
z-index: 2;
}
Expand Down
10 changes: 5 additions & 5 deletions lib/web/css/docs/source/_buttons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,10 @@ button {
}
&.example-button-6 {
.lib-button-s();
color: #fff;
color: @color-white;
&:hover,
&.active {
color: #fff;
color: @color-white;
}
}
}
Expand Down Expand Up @@ -721,13 +721,13 @@ button {
@_button-padding: @button__padding,
@_button-gradient-color-start: #1979c3,
@_button-gradient-color-end: #006bb4,
@_button-color: #fff,
@_button-color: @color-white,
@_button-gradient-color-start-hover: #006bb4,
@_button-gradient-color-end-hover: #1979c3,
@_button-color-hover: #fff,
@_button-color-hover: @color-white,
@_button-gradient-color-start-active: #006bb4,
@_button-gradient-color-end-active: #006bb4,
@_button-color-active: #fff,
@_button-color-active: @color-white,
@_button-gradient: true,
@_button-gradient-direction: vertical,
@_button-border: @button-primary__border,
Expand Down
16 changes: 8 additions & 8 deletions lib/web/css/docs/source/_pages.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,22 +852,22 @@
.example-pages-3 {
.lib-pager(
@_pager-label-display: none,
@_pager-color: #fff,
@_pager-color: @color-white,
@_pager-background: @link__color,
@_pager-color-visited: #fff,
@_pager-color-visited: @color-white,
@_pager-background-visited: @link__visited__color,
@_pager-color-hover: #fff,
@_pager-color-hover: @color-white,
@_pager-background-hover: @link__hover__color,
@_pager-color-active: #fff,
@_pager-color-active: @color-white,
@_pager-background-active: @link__active__color,
@_pager-current-color: #fff,
@_pager-current-color: @color-white,
@_pager-current-background: @link__visited__color,
@_pager-action-background: @link__color,
@_pager-action-background-visited: @link__visited__color,
@_pager-action-background-hover: @link__hover__color,
@_pager-action-background-active: @link__active__color,
@_pager-action-color: #fff,
@_pager-action-color-hover: #fff,
@_pager-action-color-active: #fff
@_pager-action-color: @color-white,
@_pager-action-color-hover: @color-white,
@_pager-action-color-active: @color-white
);
}
2 changes: 1 addition & 1 deletion lib/web/css/docs/source/_tables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@
.example-table-5 {
.lib-table();
.lib-table-background-color(
@_table-background-color: #fff,
@_table-background-color: @color-white,
@_table-head-background-color: #ccf,
@_table-foot-background-color: #cff,
@_table-td-background-color: #fcc,
Expand Down