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 | _order-summary.less | 2016-05-11 16:09:06 +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 | _order-summary.less | 2021-02-04 01:34:26 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 8 | 370 |
| Changed | 5 | 12 |
| Inserted | 2 | 7 |
| 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-summary__background-color: @color-white-smoke; | 10 | @checkout-summary__background-color: #fff; | |||
| 11 | @checkout-summary__padding: 22px @indent__l; | 11 | @checkout-summary__padding: 22px @indent__l; | |||
| 12 | 12 | |||||
| 13 | @checkout-summary-title__margin: @indent__s; | 13 | @checkout-summary-title__margin: @indent__s; | |||
| 14 | @checkout-summary-mark-value__color: @color-gray60; | 14 | @checkout-summary-mark-value__color: @color-gray60; | |||
| 15 | 15 | |||||
| 16 | @checkout-summary-items__max-height: 370px; | 16 | @checkout-summary-items__max-height: 370px; | |||
| 17 | @checkout-summary-items__padding: 15px; | 17 | @checkout-summary-items__padding: 15px; | |||
| 18 | 18 | |||||
| 19 | // | 19 | // | |||
| 20 | // Common | 20 | // Common | |||
| 21 | // _____________________________________________ | 21 | // _____________________________________________ | |||
| 22 | 22 | |||||
| 23 | & when (@media-common = true) { | 23 | & when (@media-common = true) { | |||
| 24 | 24 | |||||
| 25 | // | 25 | // | |||
| 26 | // Order Summary | 26 | // Order Summary | |||
| 27 | // --------------------------------------------- | 27 | // --------------------------------------------- | |||
| 28 | 28 | |||||
| 29 | .opc-block-summary { | 29 | .opc-block-summary { | |||
| 30 | .lib-css(background, @checkout-summary__background-color); | 30 | .lib-css(background, @checkout-summary__background-color); | |||
| 31 | .lib-css(padding, @checkout-summary__padding); | 31 | .lib-css(padding, @checkout-summary__padding); | |||
| 32 | border: 1px solid #ddd; | 32 | border: 2px solid #e7e7e7; | |||
| 33 | border-radius: 8px; | 33 | border-radius: 0; | |||
| 34 | margin-bottom: 30px; | 34 | margin-bottom: 30px; | |||
| 35 | 35 | |||||
| 36 | &:extend(.abs-add-box-sizing all); | 36 | &:extend(.abs-add-box-sizing all); | |||
| 37 | 37 | |||||
| 38 | > .title { | 38 | > .title { | |||
| 39 | &:extend(.abs-checkout-title all); | 39 | &:extend(.abs-checkout-title all); | |||
| 40 | text-transform: uppercase; | |||||
| 41 | font-weight: 600; | |||||
| 42 | color: #222529; | |||||
| 40 | display: block; | 43 | display: block; | |||
| 41 | } | 44 | } | |||
| 42 | 45 | |||||
| 43 | // Totals table | 46 | // Totals table | |||
| 44 | .table-totals { | 47 | .table-totals { | |||
| 45 | &:extend(.abs-sidebar-totals all); | 48 | &:extend(.abs-sidebar-totals all); | |||
| 46 | } | 49 | } | |||
| 47 | 50 | |||||
| 48 | .mark { | 51 | .mark { | |||
| 49 | .value { | 52 | .value { | |||
| 50 | .lib-css(color, @checkout-summary-mark-value__color); | 53 | .lib-css(color, @checkout-summary-mark-value__color); | |||
| 51 | display: block; | 54 | display: block; | |||
| 52 | } | 55 | } | |||
| 53 | } | 56 | } | |||
| 54 | 57 | |||||
| 55 | .grand.incl { | 58 | .grand.incl { | |||
| 56 | & + .grand.excl { | 59 | & + .grand.excl { | |||
| 57 | .mark, | 60 | .mark, | |||
| 58 | .amount { | 61 | .amount { | |||
| 59 | border-top: 0; | 62 | border-top: 0; | |||
| 60 | .lib-font-size(14); | 63 | .lib-font-size(14); | |||
| 61 | padding-top: 0; | 64 | padding-top: 0; | |||
| 62 | strong { | 65 | strong { | |||
| 63 | font-weight: @font-weight__regular; | 66 | font-weight: @font-weight__regular; | |||
| 64 | } | 67 | } | |||
| 65 | } | 68 | } | |||
| 66 | } | 69 | } | |||
| 67 | } | 70 | } | |||
| 68 | 71 | |||||
| 69 | .not-calculated { | 72 | .not-calculated { | |||
| 70 | font-style: italic; | 73 | font-style: italic; | |||
| 71 | } | 74 | } | |||
| 72 | 75 | |||||
| 73 | // | 76 | // | |||
| 74 | // Items list | 77 | // Items list | |||
| 75 | // --------------------------------------------- | 78 | // --------------------------------------------- | |||
| 76 | 79 | |||||
| 77 | // Block title | 80 | // Block title | |||
| 78 | .items-in-cart { | 81 | .items-in-cart { | |||
| 79 | > .title { | 82 | > .title { | |||
| 80 | border-bottom: @border-width__base solid @border-color__base; | 83 | border-bottom: @border-width__base solid @border-color__base; | |||
| 81 | .lib-css(padding, @indent__s @indent__xl @indent__s 0); | 84 | .lib-css(padding, @indent__s @indent__xl @indent__s 0); | |||
| 82 | cursor: pointer; | 85 | cursor: pointer; | |||
| 83 | .lib-icon-font( | 86 | .lib-icon-font( | |||
| 84 | @icon-down, | 87 | @icon-down, | |||
| 85 | @_icon-font-size: 12px, | 88 | @_icon-font-size: 12px, | |||
| 86 | @_icon-font-line-height: 12px, | 89 | @_icon-font-line-height: 12px, | |||
| 87 | @_icon-font-text-hide: true, | 90 | @_icon-font-text-hide: true, | |||
| 88 | @_icon-font-margin: 3px 0 0, | 91 | @_icon-font-margin: 3px 0 0, | |||
| 89 | @_icon-font-position: after, | 92 | @_icon-font-position: after, | |||
| 90 | @_icon-font-display: block | 93 | @_icon-font-display: block | |||
| 91 | ); | 94 | ); | |||
| 92 | margin-bottom: 0; | 95 | margin-bottom: 0; | |||
| 93 | position: relative; | 96 | position: relative; | |||
| 94 | &:after { | 97 | &:after { | |||
| 95 | position: absolute; | 98 | position: absolute; | |||
| 96 | right: 0; | 99 | right: 0; | |||
| 97 | top: @indent__s; | 100 | top: @indent__s; | |||
| 98 | } | 101 | } | |||
| 99 | strong { | 102 | strong { | |||
| 100 | .lib-font-size(18); | 103 | .lib-font-size(10); | |||
| 101 | font-weight: @font-weight__light; | 104 | font-weight: @font-weight__light; | |||
| 102 | margin: 0; | 105 | margin: 0; | |||
| 103 | } | 106 | } | |||
| 104 | } | 107 | } | |||
| 105 | &.active { | 108 | &.active { | |||
| 106 | > .title { | 109 | > .title { | |||
| 107 | .lib-icon-font-symbol( | 110 | .lib-icon-font-symbol( | |||
| 108 | @_icon-font-content: @icon-up, | 111 | @_icon-font-content: @icon-up, | |||
| 109 | @_icon-font-position: after | 112 | @_icon-font-position: after | |||
| 110 | ); | 113 | ); | |||
| 111 | } | 114 | } | |||
| 112 | } | 115 | } | |||
| 113 | .product { | 116 | .product { | |||
| 114 | position: relative; | 117 | position: relative; | |||
| 115 | } | 118 | } | |||
| 116 | } | 119 | } | |||
| 117 | 120 | |||||
| 118 | // Cart items | 121 | // Cart items | |||
| 119 | .minicart-items-wrapper { | 122 | .minicart-items-wrapper { | |||
| 120 | .lib-css(margin, 0 -(@checkout-summary-items__padding) 0 0); | 123 | .lib-css(margin, 0 -(@checkout-summary-items__padding) 0 0); | |||
| 121 | .lib-css(max-height, @checkout-summary-items__max-height); | 124 | .lib-css(max-height, @checkout-summary-items__max-height); | |||
| 122 | .lib-css(padding, @checkout-summary-items__padding @checkout-summary-items__padding 0 0); | 125 | .lib-css(padding, @checkout-summary-items__padding @checkout-summary-items__padding 0 0); | |||
| 123 | border: 0; | 126 | border: 0; | |||
| 124 | } | 127 | } | |||
| 125 | .column.main & { | 128 | .column.main & { | |||
| 126 | .product-item { | 129 | .product-item { | |||
| 127 | margin: 0; | 130 | margin: 0; | |||
| 128 | padding-left: | 131 | padding | |||
| 129 | } | 132 | } | |||
| 130 | } | 133 | } | |||
| 131 | .product-item { | 134 | .product-item { | |||
| 135 | .product .product-image-container { | |||||
| 136 | background: none; | |||||
| 137 | padding-right: 10px; | |||||
| 138 | } | |||||
| 132 | .product-item-inner { | 139 | .product-item-inner { | |||
| 133 | display: table; | 140 | display: table; | |||
| 134 | margin: 0 0 @indent__s; | 141 | margin: 0 0 @indent__s; | |||
| 135 | width: 100%; | 142 | width: 100%; | |||
| 136 | } | 143 | } | |||
| 137 | .product-item-name-block { | 144 | .product-item-name-block { | |||
| 138 | display: table-cell; | 145 | display: table-cell; | |||
| 139 | padding-right: @indent__xs; | 146 | padding-right: @indent__xs; | |||
| 140 | text-align: left; | 147 | text-align: left; | |||
| 141 | } | 148 | } | |||
| 142 | .subtotal { | 149 | .subtotal { | |||
| 143 | display: table-cell; | 150 | display: table-cell; | |||
| 144 | text-align: right; | 151 | text-align: right; | |||
| 145 | } | 152 | } | |||
| 146 | .price { | 153 | .price { | |||
| 147 | .lib-font-size(16); | 154 | .lib-font-size(16); | |||
| 148 | font-weight: @font-weight__regular; | 155 | font-weight: @font-weight__regular; | |||
| 149 | } | 156 | } | |||
| 150 | .price-including-tax { | 157 | .price-including-tax { | |||
| 151 | & + .price-excluding-tax { | 158 | & + .price-excluding-tax { | |||
| 152 | .price { | 159 | .price { | |||
| 153 | .lib-font-size(10); | 160 | .lib-font-size(10); | |||
| 154 | } | 161 | } | |||
| 155 | } | 162 | } | |||
| 156 | } | 163 | } | |||
| 157 | } | 164 | } | |||
| 158 | } | 165 | } | |||
| 159 | } | 166 | } | |||
| 160 | 167 | |||||
| 161 | // | 168 | // | |||
| 162 | // Mobile | 169 | // Mobile | |||
| 163 | // _____________________________________________ | 170 | // _____________________________________________ | |||
| 164 | 171 | |||||
| 165 | .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { | 172 | .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { | |||
| 166 | .opc-block-summary { | 173 | .opc-block-summary { | |||
| 167 | > .title { | 174 | > .title { | |||
| 168 | border-bottom: 0; | 175 | border-bottom: 0; | |||
| 169 | .lib-css(font-size, @checkout-step-title-mobile__font-size); | 176 | .lib-css(font-size, @checkout-step-title-mobile__font-size); | |||
| 170 | margin-bottom: @indent__base; | 177 | margin-bottom: @indent__base; | |||
| 171 | padding-bottom: 0; | 178 | padding-bottom: 0; | |||
| 172 | } | 179 | } | |||
| 173 | .totals { | 180 | .totals { | |||
| 174 | &:extend(.abs-sidebar-totals-mobile all); | 181 | &:extend(.abs-sidebar-totals-mobile all); | |||
| 175 | } | 182 | } | |||
| 176 | } | 183 | } | |||
| 177 | } | 184 | } | |||
| 178 | 185 | |||||
| 179 | // | 186 | // | |||
| 180 | // Desktop | 187 | // Desktop | |||
| 181 | // _____________________________________________ | 188 | // _____________________________________________ | |||
| 182 | 189 | |||||
| 183 | .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { | 190 | .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { | |||
| 184 | .opc-summary-wrapper { | 191 | .opc-summary-wrapper { | |||
| 185 | .modal-header { | 192 | .modal-header { | |||
| 186 | .action-close { | 193 | .action-close { | |||
| 187 | display: none; | 194 | display: none; | |||
| 188 | } | 195 | } | |||
| 189 | } | 196 | } | |||
| 190 | } | 197 | } | |||
| 191 | } | 198 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.