From 025e08ca07e470078c8082cabb969ee9119b4f7b Mon Sep 17 00:00:00 2001 From: tuna Date: Thu, 24 Dec 2020 16:28:39 +0700 Subject: [PATCH] Clean code less vendor prefix appearance up UPDATE UP update --- .../main/actions-bar/_store-switcher.less | 3 ++- .../web/css/source/_module-old.less | 18 ++++++++---------- .../module/components/_currency-addon.less | 10 +--------- .../web/css/source/_module.less | 2 -- .../web/css/source/_module.less | 10 +++++++++- .../web/css/source/module/order/_sidebar.less | 2 +- .../Magento_Tax/web/css/source/_module.less | 2 +- .../data-grid-header/_data-grid-pager.less | 4 ++-- .../backend/web/css/source/_actions.less | 3 --- .../Magento/backend/web/css/source/_reset.less | 9 +++------ .../css/source/actions/_actions-dropdown.less | 7 ++----- .../web/css/source/forms/_controls.less | 4 ++-- .../backend/web/css/source/forms/_temp.less | 3 +-- .../Magento/backend/web/css/styles-old.less | 5 ++--- .../Magento/luma/web/css/source/_forms.less | 3 +-- 15 files changed, 35 insertions(+), 50 deletions(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less index c4bb1a027e4b9..5e6810ffe77b6 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less @@ -43,9 +43,10 @@ overflow-y: auto; padding-top: .25em; &::-webkit-scrollbar { - -webkit-appearance: none; + .lib-vendor-prefix-appearance(none); width: 7px; } + &::-webkit-scrollbar-thumb { background-color: rgba(0, 0, 0, .5); border-radius: 4px; diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less index 027561423892f..031f96bc20d90 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less +++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less @@ -90,8 +90,6 @@ .field-gift_wrapping_price { &:not(.field-weight) { .addon { - .lib-vendor-prefix-display(inline-flex); - .lib-vendor-prefix-flex-direction(row); color: #303030; display: inline-flex; flex-flow: row nowrap; @@ -142,10 +140,10 @@ } .admin__control-text { - .lib-css(appearance, none, 1); - .lib-vendor-prefix-flex-basis(auto); - .lib-vendor-prefix-flex-grow(1); - .lib-vendor-prefix-flex-shrink(1); + .lib-vendor-prefix-appearance(none); + flex-basis: auto; + flex-grow: 1; + flex-shrink: 1; background: none; border: 0; } @@ -159,10 +157,10 @@ } .addafter { - .lib-vendor-prefix-flex-basis(auto); - .lib-vendor-prefix-flex-grow(0); - .lib-vendor-prefix-flex-shrink(0); - .lib-vendor-prefix-order(0); + flex-basis: auto; + flex-grow: 0; + flex-shrink: 0; + order: 0; position: relative; z-index: 0; diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less index 654236e143a29..657530822d465 100644 --- a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less +++ b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less @@ -25,12 +25,7 @@ width: 100%; .admin__control-text { - -ms-flex-order: 1; - -webkit-appearance: none; - -webkit-flex-grow: 1; - -webkit-flex-shrink: 1; - -webkit-order: 1; - appearance: none; + .lib-vendor-prefix-appearance(none); background-color: transparent; border-color: transparent; box-shadow: none; @@ -53,9 +48,6 @@ } .currency-symbol { - -webkit-flex-basis: auto; - -webkit-flex-grow: 0; - -webkit-flex-shrink: 0; border: solid @currency-addon-symbol__border-color; border-width: 0; box-sizing: border-box; diff --git a/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less index e526ae4857469..910c9426a20d7 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less +++ b/app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less @@ -18,8 +18,6 @@ *, *:after, *:before { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; box-sizing: border-box; } diff --git a/app/design/adminhtml/Magento/backend/Magento_ProductVideo/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_ProductVideo/web/css/source/_module.less index 1b8ce7158488d..b1d5bab55ebbf 100644 --- a/app/design/adminhtml/Magento/backend/Magento_ProductVideo/web/css/source/_module.less +++ b/app/design/adminhtml/Magento/backend/Magento_ProductVideo/web/css/source/_module.less @@ -153,7 +153,11 @@ &.field-video_swatch_image, &.field-new_video_disabled { .admin__field-control { + /** + * @codingStandardsIgnoreStart + */ #mix-grid .column(3, @field-grid__columns); + //@codingStandardsIgnoreEnd float: left; margin-left: 80px; position: relative; @@ -197,7 +201,11 @@ height: 0; .admin__field-control { + /** + * @codingStandardsIgnoreStart + */ #mix-grid .column(3, @field-grid__columns); + //@codingStandardsIgnoreEnd float: left; margin-left: 80px; position: relative; @@ -221,7 +229,7 @@ } input[type='checkbox'] { - .lib-css(appearance, none, 1); + .lib-vendor-prefix-appearance(none); background: @color-white; border: 1px solid @color-gray68; border-radius: 2px; diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less index 19a6782b0ccd0..2245360fdac5f 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less +++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_sidebar.less @@ -139,7 +139,7 @@ // Force a scroll bar to appear on IOS devices &::-webkit-scrollbar { - -webkit-appearance: none; + .lib-vendor-prefix-appearance(none); height: 4px; } diff --git a/app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module.less index 49459bc11cfb2..e446b36beb905 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module.less +++ b/app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module.less @@ -4,7 +4,7 @@ // */ .block-footer .action-add { - -webkit-appearance: none; + .lib-vendor-prefix-appearance(none); &:extend(.action-default, button all); } diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-pager.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-pager.less index 3c1307b1b841a..3426423a32169 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-pager.less +++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-pager.less @@ -26,12 +26,12 @@ .admin__control-text::-webkit-outer-spin-button, .admin__control-text::-webkit-inner-spin-button { - -webkit-appearance: none; + .lib-vendor-prefix-appearance(none); margin: 0; } .admin__control-text { - -moz-appearance: textfield; + .lib-vendor-prefix-appearance(textfield); text-align: center; width: @data-grid-pager-action__width; } diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less index 852c6c1f3799e..7b87d11959c09 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less @@ -436,10 +436,7 @@ button { } &._parent { - .lib-vendor-prefix-display(flex); - .lib-vendor-prefix-flex-direction(row); display: flex; - flex-direction: row; > .action-menu-item { min-width: 100%; diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_reset.less b/app/design/adminhtml/Magento/backend/web/css/source/_reset.less index 51de756bff16c..3c5f26678bf78 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/_reset.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/_reset.less @@ -232,8 +232,7 @@ button, html input[type='button'], input[type='reset'], input[type='submit'] { - -webkit-appearance: button; - appearance: button; + .lib-vendor-prefix-appearance(button); cursor: pointer; } @@ -274,8 +273,7 @@ input[type='number'] { // Address 'appearance' set to 'searchfield' in Safari and Chrome. input[type='search'] { - -webkit-appearance: textfield; - appearance: textfield; + .lib-vendor-prefix-appearance(textfield); } // Remove inner padding and search cancel button in Safari and Chrome on OS X. @@ -283,8 +281,7 @@ input[type='search'] { input[type='search'] { &::-webkit-search-cancel-button, &::-webkit-search-decoration { - -webkit-appearance: none; - appearance: none; + .lib-vendor-prefix-appearance(none); } } diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less index d1fe33c4fe77d..609723c7a6be0 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less @@ -230,7 +230,7 @@ display: inline-block; input[type='text'] { - .lib-css(appearance, none, 1); + .lib-vendor-prefix-appearance(none); border: 0; display: inline; margin: 0; @@ -320,10 +320,7 @@ } li { - .lib-vendor-prefix-display(flex); - .lib-vendor-prefix-flex-direction(row); display: flex; - flex-direction: row; transition: background .2s linear; &:hover { @@ -370,7 +367,7 @@ } .selectmenu-item-action { - .lib-css(appearance, none, 1); + .lib-vendor-prefix-appearance(none); background: transparent; border: 0; color: @text__color; diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less index c6f39e8e8840d..47a127eb8e35f 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less @@ -15,7 +15,7 @@ // Common .__form-control-pattern() { - -webkit-appearance: none; + .lib-vendor-prefix-appearance(none); background-color: @field-control__background-color; border: @field-control__border-width solid @field-control__border-color; border-radius: @field-control__border-radius; @@ -58,7 +58,7 @@ // Select styles .admin__control-select { &:extend(.abs-form-control-pattern all); - .lib-css(appearance, none, 1); + .lib-vendor-prefix-appearance(none); background-image+: url('../images/arrows-bg.svg'); background-position+: ~'calc(100% - 12px)' -34px; background-size+: auto; diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less index 71f57b765ff0e..c7a9ea9f43e2b 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less @@ -471,8 +471,7 @@ label.mage-error { .admin__data-grid-header-row { .action-select-multiselect { - -webkit-appearance: menulist-button; - appearance: menulist-button; + .lib-vendor-prefix-appearance(menulist-button); height: 38px; left: -1rem; min-width: 0; diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less index 3087e7762a2d8..f748553385164 100644 --- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less +++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less @@ -799,8 +799,7 @@ select { &:not([multiple]) { - .lib-css(appearance, none, 1); - + .lib-vendor-prefix-appearance(none); display: inline-block; line-height: normal; min-width: 80px; @@ -858,7 +857,7 @@ input[type="radio"], input[type="checkbox"] { - .lib-css(appearance, none, 1); + .lib-vendor-prefix-appearance(none); background: @color-white; border-radius: 2px; border: 1px solid #adadad; diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less index 8533318a12d1b..0c71fd63a40a5 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_forms.less +++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less @@ -89,8 +89,7 @@ } .select-styling() { - .lib-css(appearance, none, 1); - appearance: none; + .lib-vendor-prefix-appearance(none); background-size: 30px 60px; text-indent: .01em; text-overflow: '';