Skip to content

Commit 3ae89b6

Browse files
ENGCOM-6021: Remove duplicate CSS properties #24884
- Merge Pull Request #24884 from DanielRuf/magento2:chore/remove-duplicate-css-properties - Merged commits: 1. 5d6b72d 2. 494c15b
2 parents 68c48d5 + 494c15b commit 3ae89b6

File tree

5 files changed

+2
-37
lines changed

5 files changed

+2
-37
lines changed

app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
position: relative;
2323
display: -webkit-inline-flex;
2424
display: -ms-inline-flexbox;
25+
display: inline-flex;
2526
-webkit-flex-direction: row;
2627
-ms-flex-direction: row;
2728
flex-direction: row;
28-
display: inline-flex;
2929
flex-flow: row nowrap;
3030
width: 100%;
3131

dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,6 @@ table .col-draggable .draggable-handle {
484484
border: 0;
485485
display: inline;
486486
line-height: 1.42857143;
487-
margin: 0;
488487
padding: 0;
489488
color: #1979c3;
490489
text-decoration: none;
@@ -621,7 +620,6 @@ fieldset[disabled] .grid-actions .action-reset {
621620
background: none;
622621
border: 0;
623622
display: inline;
624-
line-height: 1.42857143;
625623
margin: 0;
626624
padding: 0;
627625
color: #1979c3;
@@ -683,7 +681,6 @@ fieldset[disabled] .pager .action-next {
683681
text-decoration: none;
684682
}
685683
.pager .action-previous > span {
686-
clip: rect(0, 0, 0, 0);
687684
border: 0;
688685
clip: rect(0 0 0 0);
689686
height: 1px;
@@ -733,7 +730,6 @@ fieldset[disabled] .pager .action-next {
733730
text-decoration: none;
734731
}
735732
.pager .action-next > span {
736-
clip: rect(0, 0, 0, 0);
737733
border: 0;
738734
clip: rect(0 0 0 0);
739735
height: 1px;
@@ -1510,7 +1506,6 @@ fieldset[disabled] .pager .action-next {
15101506
text-decoration: none;
15111507
}
15121508
.search-global-field .label > span {
1513-
clip: rect(0, 0, 0, 0);
15141509
border: 0;
15151510
clip: rect(0 0 0 0);
15161511
height: 1px;
@@ -1622,7 +1617,6 @@ fieldset[disabled] .pager .action-next {
16221617
color: #676056;
16231618
}
16241619
.notifications-action .text {
1625-
clip: rect(0, 0, 0, 0);
16261620
border: 0;
16271621
clip: rect(0 0 0 0);
16281622
height: 1px;
@@ -1707,7 +1701,6 @@ fieldset[disabled] .pager .action-next {
17071701
z-index: 1;
17081702
top: 12px;
17091703
right: 12px;
1710-
display: inline-block;
17111704
background-image: none;
17121705
background: none;
17131706
border: 0;
@@ -2358,7 +2351,6 @@ fieldset[disabled] .notifications-close.action {
23582351
text-decoration: none;
23592352
}
23602353
#product-variations-matrix .actions-image-uploader {
2361-
display: inline-block;
23622354
position: relative;
23632355
display: block;
23642356
width: 50px;
@@ -3109,7 +3101,6 @@ body > * {
31093101
background-image: none;
31103102
background: none;
31113103
border: 0;
3112-
margin: 0;
31133104
padding: 0;
31143105
-moz-box-sizing: content-box;
31153106
box-shadow: none;
@@ -3396,7 +3387,6 @@ fieldset[disabled] .page-main-actions .page-actions .action-add.mselect-button-a
33963387
box-shadow: none;
33973388
text-shadow: none;
33983389
text-decoration: none;
3399-
line-height: inherit;
34003390
font-weight: 400;
34013391
color: #026294;
34023392
line-height: normal;
@@ -3464,7 +3454,6 @@ fieldset[disabled] .store-switcher .actions.dropdown .action.toggle {
34643454
margin-top: 10px;
34653455
}
34663456
.store-switcher .actions.dropdown ul.dropdown-menu .dropdown-toolbar a {
3467-
display: inline-block;
34683457
text-decoration: none;
34693458
display: block;
34703459
}
@@ -4833,17 +4822,11 @@ fieldset[disabled] .control-text + .ui-datepicker-trigger {
48334822
width: 100%;
48344823
}
48354824
.filters-toggle {
4836-
background: #f2ebde;
4837-
padding: 6px 13px;
48384825
color: #645d53;
4839-
border: 1px solid #ada89e;
48404826
cursor: pointer;
48414827
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
48424828
font-size: 1.3rem;
4843-
font-weight: 500;
4844-
line-height: 1.4rem;
48454829
box-sizing: border-box;
4846-
margin: 3px;
48474830
vertical-align: middle;
48484831
display: inline-block;
48494832
background-image: none;
@@ -4946,7 +4929,6 @@ fieldset[disabled] .filters-toggle {
49464929
.filters-item .action-remove {
49474930
background-image: none;
49484931
background: #f2ebde;
4949-
padding: 6px 13px;
49504932
color: #645d53;
49514933
border: 1px solid #ada89e;
49524934
cursor: pointer;
@@ -5038,17 +5020,11 @@ fieldset[disabled] .filters-item .action-remove {
50385020
position: absolute;
50395021
top: 3px;
50405022
right: 7px;
5041-
background: #f2ebde;
5042-
padding: 6px 13px;
50435023
color: #645d53;
5044-
border: 1px solid #ada89e;
50455024
cursor: pointer;
50465025
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
50475026
font-size: 1.3rem;
5048-
font-weight: 500;
5049-
line-height: 1.4rem;
50505027
box-sizing: border-box;
5051-
margin: 3px;
50525028
vertical-align: middle;
50535029
display: inline-block;
50545030
background-image: none;
@@ -5283,13 +5259,11 @@ fieldset[disabled] .filters-form .action-close {
52835259
border: 1px solid #c2c2c2;
52845260
border-radius: 1px;
52855261
height: 32px;
5286-
width: 100%;
52875262
padding: 0 9px;
52885263
font-size: 14px;
52895264
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
52905265
line-height: 1.428571429;
52915266
background-clip: padding-box;
5292-
vertical-align: baseline;
52935267
width: auto;
52945268
white-space: nowrap;
52955269
vertical-align: middle;
@@ -5487,17 +5461,11 @@ fieldset[disabled] .filters .field-date .group .hasDatepicker + .ui-datepicker-t
54875461
background: rgba(0, 0, 0, 0.2);
54885462
}
54895463
.mass-select-toggle {
5490-
background: #f2ebde;
5491-
padding: 6px 13px;
54925464
color: #645d53;
5493-
border: 1px solid #ada89e;
54945465
cursor: pointer;
54955466
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
54965467
font-size: 1.3rem;
5497-
font-weight: 500;
5498-
line-height: 1.4rem;
54995468
box-sizing: border-box;
5500-
margin: 3px;
55015469
vertical-align: middle;
55025470
display: inline-block;
55035471
background-image: none;
@@ -5754,7 +5722,6 @@ fieldset[disabled] .mass-select-toggle {
57545722
.page-actions.fixed .page-actions-inner,
57555723
.page-content,
57565724
.page-footer {
5757-
width: auto;
57585725
min-width: 960px;
57595726
max-width: 1300px;
57605727
margin: 0 auto;

lib/web/mage/calendar.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@
141141
padding: 0;
142142
}
143143
.ui-datepicker {
144-
background: #ffffff;
145144
padding: 15px;
146145
border: #ffffff 4px solid;
147146
-webkit-box-sizing: border-box;

lib/web/mage/translate-inline-vde.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
}
5353

5454
.translate-dialog .ui-dialog-buttonset {
55-
padding-right: 0;
5655
margin-right: 0;
5756
float: right;
5857
background: rgba(223, 243, 250, 1.0);

0 commit comments

Comments
 (0)