287. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:43:07 +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.

287.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout_order-summary.less2021-02-04 01:34:26 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout_order-summary.less2021-02-04 01:34:26 +0000

287.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1396
Changed00
Inserted00
Removed00

287.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

287.4 Active regular expressions

No regular expressions were active.

287.5 Comparison detail

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: #fff; 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: 2px solid #e7e7e7; 32         border: 2px solid #e7e7e7;
33         border-radius: 0; 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; 40             text-transform: uppercase;
41             font-weight: 600; 41             font-weight: 600;
42             color: #222529; 42             color: #222529;
43             display: block; 43             display: block;
44         } 44         }
45  45 
46         //  Totals table 46         //  Totals table
47         .table-totals { 47         .table-totals {
48             &:extend(.abs-sidebar-totals all); 48             &:extend(.abs-sidebar-totals all);
49         } 49         }
50  50 
51         .mark { 51         .mark {
52             .value { 52             .value {
53                 .lib-css(color, @checkout-summary-mark-value__color); 53                 .lib-css(color, @checkout-summary-mark-value__color);
54                 display: block; 54                 display: block;
55             } 55             }
56         } 56         }
57  57 
58         .grand.incl { 58         .grand.incl {
59             & + .grand.excl { 59             & + .grand.excl {
60                 .mark, 60                 .mark,
61                 .amount { 61                 .amount {
62                     border-top: 0; 62                     border-top: 0;
63                     .lib-font-size(14); 63                     .lib-font-size(14);
64                     padding-top: 0; 64                     padding-top: 0;
65                     strong { 65                     strong {
66                         font-weight: @font-weight__regular; 66                         font-weight: @font-weight__regular;
67                     } 67                     }
68                 } 68                 }
69             } 69             }
70         } 70         }
71  71 
72         .not-calculated { 72         .not-calculated {
73             font-style: italic; 73             font-style: italic;
74         } 74         }
75  75 
76         // 76         //
77         //  Items list 77         //  Items list
78         //  --------------------------------------------- 78         //  ---------------------------------------------
79  79 
80         //  Block title 80         //  Block title
81         .items-in-cart { 81         .items-in-cart {
82             > .title { 82             > .title {
83                 border-bottom: @border-width__base solid @border-color__base; 83                 border-bottom: @border-width__base solid @border-color__base;
84                 .lib-css(padding, @indent__s @indent__xl @indent__s 0); 84                 .lib-css(padding, @indent__s @indent__xl @indent__s 0);
85                 cursor: pointer; 85                 cursor: pointer;
86                 .lib-icon-font( 86                 .lib-icon-font(
87                 @icon-down, 87                 @icon-down,
88                 @_icon-font-size: 12px, 88                 @_icon-font-size: 12px,
89                 @_icon-font-line-height: 12px, 89                 @_icon-font-line-height: 12px,
90                 @_icon-font-text-hide: true, 90                 @_icon-font-text-hide: true,
91                 @_icon-font-margin: 3px 0 0, 91                 @_icon-font-margin: 3px 0 0,
92                 @_icon-font-position: after, 92                 @_icon-font-position: after,
93                 @_icon-font-display: block 93                 @_icon-font-display: block
94                 ); 94                 );
95                 margin-bottom: 0; 95                 margin-bottom: 0;
96                 position: relative; 96                 position: relative;
97                 &:after { 97                 &:after {
98                     position: absolute; 98                     position: absolute;
99                     right: 0; 99                     right: 0;
100                     top: @indent__s; 100                     top: @indent__s;
101                 } 101                 }
102                 strong { 102                 strong {
103                     .lib-font-size(10); 103                     .lib-font-size(10);
104                     font-weight: @font-weight__light; 104                     font-weight: @font-weight__light;
105                     margin: 0; 105                     margin: 0;
106                 } 106                 }
107             } 107             }
108             &.active { 108             &.active {
109                 > .title { 109                 > .title {
110                     .lib-icon-font-symbol( 110                     .lib-icon-font-symbol(
111                     @_icon-font-content: @icon-up, 111                     @_icon-font-content: @icon-up,
112                     @_icon-font-position: after 112                     @_icon-font-position: after
113                     ); 113                     );
114                 } 114                 }
115             } 115             }
116             .product { 116             .product {
117                 position: relative; 117                 position: relative;
118             } 118             }
119         } 119         }
120  120 
121         //  Cart items 121         //  Cart items
122         .minicart-items-wrapper { 122         .minicart-items-wrapper {
123             .lib-css(margin, 0 -(@checkout-summary-items__padding) 0 0); 123             .lib-css(margin, 0 -(@checkout-summary-items__padding) 0 0);
124             .lib-css(max-height, @checkout-summary-items__max-height); 124             .lib-css(max-height, @checkout-summary-items__max-height);
125             .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);
126             border: 0; 126             border: 0;
127         } 127         }
128         .column.main & { 128         .column.main & {
129             .product-item { 129             .product-item {
130                 margin: 0; 130                 margin: 0;
131                 padding: 5px 0; 131                 padding: 5px 0;
132             } 132             }
133         } 133         }
134         .product-item { 134         .product-item {
135             .product .product-image-container { 135             .product .product-image-container {
136               background: none; 136               background: none;
137               padding-right: 10px; 137               padding-right: 10px;
138             } 138             }
139             .product-item-inner { 139             .product-item-inner {
140                 display: table; 140                 display: table;
141                 margin: 0 0 @indent__s; 141                 margin: 0 0 @indent__s;
142                 width: 100%; 142                 width: 100%;
143             } 143             }
144             .product-item-name-block { 144             .product-item-name-block {
145                 display: table-cell; 145                 display: table-cell;
146                 padding-right: @indent__xs; 146                 padding-right: @indent__xs;
147                 text-align: left; 147                 text-align: left;
148             } 148             }
149             .subtotal { 149             .subtotal {
150                 display: table-cell; 150                 display: table-cell;
151                 text-align: right; 151                 text-align: right;
152             } 152             }
153             .price { 153             .price {
154                 .lib-font-size(16); 154                 .lib-font-size(16);
155                 font-weight: @font-weight__regular; 155                 font-weight: @font-weight__regular;
156             } 156             }
157             .price-including-tax { 157             .price-including-tax {
158                 & + .price-excluding-tax { 158                 & + .price-excluding-tax {
159                     .price { 159                     .price {
160                         .lib-font-size(10); 160                         .lib-font-size(10);
161                     } 161                     }
162                 } 162                 }
163             } 163             }
164         } 164         }
165     } 165     }
166 } 166 }
167  167 
168 // 168 //
169 //  Mobile 169 //  Mobile
170 //  _____________________________________________ 170 //  _____________________________________________
171  171 
172 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 172 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
173     .opc-block-summary { 173     .opc-block-summary {
174         > .title { 174         > .title {
175             border-bottom: 0; 175             border-bottom: 0;
176             .lib-css(font-size, @checkout-step-title-mobile__font-size); 176             .lib-css(font-size, @checkout-step-title-mobile__font-size);
177             margin-bottom: @indent__base; 177             margin-bottom: @indent__base;
178             padding-bottom: 0; 178             padding-bottom: 0;
179         } 179         }
180         .totals { 180         .totals {
181             &:extend(.abs-sidebar-totals-mobile all); 181             &:extend(.abs-sidebar-totals-mobile all);
182         } 182         }
183     } 183     }
184 } 184 }
185  185 
186 // 186 //
187 //  Desktop 187 //  Desktop
188 //  _____________________________________________ 188 //  _____________________________________________
189  189 
190 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 190 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
191     .opc-summary-wrapper { 191     .opc-summary-wrapper {
192         .modal-header { 192         .modal-header {
193             .action-close { 193             .action-close {
194                 display: none; 194                 display: none;
195             } 195             }
196         } 196         }
197     } 197     }
198 } 198 }