Produced by Araxis Merge on 2021-05-13 09:09:03 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout | _payments.less | 2016-05-11 16:08:02 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout | _payments.less | 2016-05-11 16:08:02 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 1 | 398 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | // /** | 1 | // /** | |||
| 2 | // * Copyright © 2015 Magento. All rights reserved. | 2 | // * Copyright © 2015 Magento. All rights reserved. | |||
| 3 | // * See COPYING.txt for license details. | 3 | // * See COPYING.txt for license details. | |||
| 4 | // */ | 4 | // */ | |||
| 5 | 5 | |||||
| 6 | // | 6 | // | |||
| 7 | // Variables | 7 | // Variables | |||
| 8 | // _____________________________________________ | 8 | // _____________________________________________ | |||
| 9 | 9 | |||||
| 10 | @checkout-payment-method-title__border: @checkout-shipping-method__border; | 10 | @checkout-payment-method-title__border: @checkout-shipping-method__border; | |||
| 11 | @checkout-payment-method-title__padding: @checkout-shipping-method__padding; | 11 | @checkout-payment-method-title__padding: @checkout-shipping-method__padding; | |||
| 12 | @checkout-payment-method-title-mobile__padding: 15px; | 12 | @checkout-payment-method-title-mobile__padding: 15px; | |||
| 13 | 13 | |||||
| 14 | @checkout-payment-method-content__padding__xl: 22px; | 14 | @checkout-payment-method-content__padding__xl: 22px; | |||
| 15 | 15 | |||||
| 16 | @checkout-billing-address-details__line-height: 27px; | 16 | @checkout-billing-address-details__line-height: 27px; | |||
| 17 | @checkout-billing-address-details__padding: 0 0 0 23px; | 17 | @checkout-billing-address-details__padding: 0 0 0 23px; | |||
| 18 | @checkout-billing-address-form__max-width: @checkout-shipping-address__max-width; | 18 | @checkout-billing-address-form__max-width: @checkout-shipping-address__max-width; | |||
| 19 | 19 | |||||
| 20 | // | 20 | // | |||
| 21 | // Common | 21 | // Common | |||
| 22 | // _____________________________________________ | 22 | // _____________________________________________ | |||
| 23 | 23 | |||||
| 24 | & when (@media-common = true) { | 24 | & when (@media-common = true) { | |||
| 25 | .checkout-payment-method { | 25 | .checkout-payment-method { | |||
| 26 | .step-title { | 26 | .step-title { | |||
| 27 | margin-bottom: 0; | 27 | margin-bottom: 0; | |||
| 28 | } | 28 | } | |||
| 29 | .payment-method { | 29 | .payment-method { | |||
| 30 | &:first-child { | 30 | &:first-child { | |||
| 31 | .payment-method-title { | 31 | .payment-method-title { | |||
| 32 | border-top: 0; | 32 | border-top: 0; | |||
| 33 | } | 33 | } | |||
| 34 | } | 34 | } | |||
| 35 | &._active { | 35 | &._active { | |||
| 36 | .payment-method-content { | 36 | .payment-method-content { | |||
| 37 | display: block; | 37 | display: block; | |||
| 38 | } | 38 | } | |||
| 39 | } | 39 | } | |||
| 40 | } | 40 | } | |||
| 41 | 41 | |||||
| 42 | .payment-method-content { | 42 | .payment-method-content { | |||
| 43 | > .actions-toolbar { | 43 | > .actions-toolbar { | |||
| 44 | > .primary { | 44 | > .primary { | |||
| 45 | .action { | 45 | .action { | |||
| 46 | &.primary { | 46 | &.primary { | |||
| 47 | &:extend(.abs-button-l all); | 47 | &:extend(.abs-button-l all); | |||
| 48 | } | 48 | } | |||
| 49 | } | 49 | } | |||
| 50 | } | 50 | } | |||
| 51 | } | 51 | } | |||
| 52 | } | 52 | } | |||
| 53 | 53 | |||||
| 54 | .payment-method-title { | 54 | .payment-method-title { | |||
| 55 | .lib-css(border-top, @checkout-payment-method-title__border); | 55 | .lib-css(border-top, @checkout-payment-method-title__border); | |||
| 56 | .lib-css(padding, @checkout-payment-method-title__padding 0); | 56 | .lib-css(padding, @checkout-payment-method-title__padding 0); | |||
| 57 | margin: 0; | 57 | margin: 0; | |||
| 58 | 58 | |||||
| 59 | .payment-icon { | 59 | .payment-icon { | |||
| 60 | display: inline-block; | 60 | display: inline-block; | |||
| 61 | margin-right: @indent__xs; | 61 | margin-right: @indent__xs; | |||
| 62 | vertical-align: middle; | 62 | vertical-align: middle; | |||
| 63 | } | 63 | } | |||
| 64 | 64 | |||||
| 65 | .action-help { | 65 | .action-help { | |||
| 66 | display: inline-block; | 66 | display: inline-block; | |||
| 67 | margin-left: @indent__xs; | 67 | margin-left: @indent__xs; | |||
| 68 | } | 68 | } | |||
| 69 | } | 69 | } | |||
| 70 | 70 | |||||
| 71 | .payment-method-content { | 71 | .payment-method-content { | |||
| 72 | display: none; | 72 | display: none; | |||
| 73 | .lib-css(padding, 0 0 @indent__base @checkout-payment-method-content__padding__xl); | 73 | .lib-css(padding, 0 0 @indent__base @checkout-payment-method-content__padding__xl); | |||
| 74 | .fieldset { | 74 | .fieldset { | |||
| 75 | &:not(:last-child) { | 75 | &:not(:last-child) { | |||
| 76 | margin: 0 0 @indent__base; | 76 | margin: 0 0 @indent__base; | |||
| 77 | } | 77 | } | |||
| 78 | } | 78 | } | |||
| 79 | } | 79 | } | |||
| 80 | 80 | |||||
| 81 | .field-select-billing, | 81 | .field-select-billing, | |||
| 82 | .billing-address-form { | 82 | .billing-address-form { | |||
| 83 | .lib-css(max-width, @checkout-billing-address-form__max-width); | 83 | .lib-css(max-width, @checkout-billing-address-form__max-width); | |||
| 84 | } | 84 | } | |||
| 85 | 85 | |||||
| 86 | .billing-address-same-as-shipping-block { | 86 | .billing-address-same-as-shipping-block { | |||
| 87 | margin: 0 0 @indent__s; | 87 | margin: 0 0 @indent__s; | |||
| 88 | } | 88 | } | |||
| 89 | 89 | |||||
| 90 | .payment-method-billing-address { | 90 | .payment-method-billing-address { | |||
| 91 | margin: 0 0 @indent__base; | 91 | margin: 0 0 @indent__base; | |||
| 92 | 92 | |||||
| 93 | .primary { | 93 | .primary { | |||
| 94 | .action-update { | 94 | .action-update { | |||
| 95 | margin-right: 0; | 95 | margin-right: 0; | |||
| 96 | } | 96 | } | |||
| 97 | } | 97 | } | |||
| 98 | 98 | |||||
| 99 | .action-cancel { | 99 | .action-cancel { | |||
| 100 | &:extend(.abs-action-button-as-link all); | 100 | &:extend(.abs-action-button-as-link all); | |||
| 101 | } | 101 | } | |||
| 102 | 102 | |||||
| 103 | .billing-address-details { | 103 | .billing-address-details { | |||
| 104 | .lib-css(line-height, @checkout-billing-address-details__line-height); | 104 | .lib-css(line-height, @checkout-billing-address-details__line-height); | |||
| 105 | .lib-css(padding, @checkout-billing-address-details__padding); | 105 | .lib-css(padding, @checkout-billing-address-details__padding); | |||
| 106 | 106 | |||||
| 107 | .action-edit-address { | 107 | .action-edit-address { | |||
| 108 | &:extend(.abs-action-button-as-link all); | 108 | &:extend(.abs-action-button-as-link all); | |||
| 109 | } | 109 | } | |||
| 110 | } | 110 | } | |||
| 111 | } | 111 | } | |||
| 112 | 112 | |||||
| 113 | .payment-method-note { | 113 | .payment-method-note { | |||
| 114 | & + .payment-method-billing-address { | 114 | & + .payment-method-billing-address { | |||
| 115 | margin-top: @indent__base; | 115 | margin-top: @indent__base; | |||
| 116 | } | 116 | } | |||
| 117 | } | 117 | } | |||
| 118 | 118 | |||||
| 119 | .field-select-billing { | 119 | .field-select-billing { | |||
| 120 | > .label { | 120 | > .label { | |||
| 121 | &:extend(.abs-visually-hidden all); | 121 | &:extend(.abs-visually-hidden all); | |||
| 122 | } | 122 | } | |||
| 123 | } | 123 | } | |||
| 124 | .payment-method-iframe { | 124 | .payment-method-iframe { | |||
| 125 | background-color: transparent; | 125 | background-color: transparent; | |||
| 126 | display: none; | 126 | display: none; | |||
| 127 | width: 100%; | 127 | width: 100%; | |||
| 128 | } | 128 | } | |||
| 129 | .no-payments-block { | 129 | .no-payments-block { | |||
| 130 | margin: @indent__base 0; | 130 | margin: @indent__base 0; | |||
| 131 | } | 131 | } | |||
| 132 | .payments { | 132 | .payments { | |||
| 133 | .legend { | 133 | .legend { | |||
| 134 | &:extend(.abs-visually-hidden all); | 134 | &:extend(.abs-visually-hidden all); | |||
| 135 | } | 135 | } | |||
| 136 | } | 136 | } | |||
| 137 | } | 137 | } | |||
| 138 | } | 138 | } | |||
| 139 | 139 | |||||
| 140 | // | 140 | // | |||
| 141 | // Mobile | 141 | // Mobile | |||
| 142 | // _____________________________________________ | 142 | // _____________________________________________ | |||
| 143 | 143 | |||||
| 144 | .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { | 144 | .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { | |||
| 145 | .checkout-payment-method { | 145 | .checkout-payment-method { | |||
| 146 | .payment-methods { | 146 | .payment-methods { | |||
| 147 | .lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding)); | 147 | .lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding)); | |||
| 148 | } | 148 | } | |||
| 149 | 149 | |||||
| 150 | .payment-method-title { | 150 | .payment-method-title { | |||
| 151 | .lib-css(padding, @checkout-payment-method-title-mobile__padding) | 151 | .lib-css(padding, @checkout-payment-method-title-mobile__padding) | |||
| 152 | } | 152 | } | |||
| 153 | 153 | |||||
| 154 | .payment-method-content { | 154 | .payment-method-content { | |||
| 155 | .lib-css(padding, 0 @checkout-payment-method-title-mobile__padding @indent__base); | 155 | .lib-css(padding, 0 @checkout-payment-method-title-mobile__padding @indent__base); | |||
| 156 | } | 156 | } | |||
| 157 | 157 | |||||
| 158 | .payment-method-billing-address { | 158 | .payment-method-billing-address { | |||
| 159 | .action-cancel { | 159 | .action-cancel { | |||
| 160 | margin-top: @indent__s; | 160 | margin-top: @indent__s; | |||
| 161 | } | 161 | } | |||
| 162 | } | 162 | } | |||
| 163 | } | 163 | } | |||
| 164 | } | 164 | } | |||
| 165 | 165 | |||||
| 166 | // | 166 | // | |||
| 167 | // Desktop | 167 | // Desktop | |||
| 168 | // _____________________________________________ | 168 | // _____________________________________________ | |||
| 169 | 169 | |||||
| 170 | .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { | 170 | .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { | |||
| 171 | .checkout-payment-method { | 171 | .checkout-payment-method { | |||
| 172 | .payment-methods { | 172 | .payment-methods { | |||
| 173 | .actions-toolbar { | 173 | .actions-toolbar { | |||
| 174 | .primary { | 174 | .primary { | |||
| 175 | float: right; | 175 | float: right; | |||
| 176 | margin: 0; | 176 | margin: 0; | |||
| 177 | } | 177 | } | |||
| 178 | } | 178 | } | |||
| 179 | } | 179 | } | |||
| 180 | .fieldset { | 180 | .fieldset { | |||
| 181 | > .field-select-billing { | 181 | > .field-select-billing { | |||
| 182 | > .control { | 182 | > .control { | |||
| 183 | float: none; | 183 | float: none; | |||
| 184 | width: 100%; | 184 | width: 100%; | |||
| 185 | } | 185 | } | |||
| 186 | } | 186 | } | |||
| 187 | } | 187 | } | |||
| 188 | } | 188 | } | |||
| 189 | .payment-method-billing-address { | 189 | .payment-method-billing-address { | |||
| 190 | .action-update { | 190 | .action-update { | |||
| 191 | float: right; | 191 | float: right; | |||
| 192 | } | 192 | } | |||
| 193 | .actions-toolbar { | 193 | .actions-toolbar { | |||
| 194 | .action-cancel { | 194 | .action-cancel { | |||
| 195 | margin: 6px @indent__base 0 0; | 195 | margin: 6px @indent__base 0 0; | |||
| 196 | } | 196 | } | |||
| 197 | } | 197 | } | |||
| 198 | } | 198 | } | |||
| 199 | } | 199 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.