284. 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.

284.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_estimated-total.less2021-02-04 02:52:06 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout_estimated-total.less2021-02-04 02:52:06 +0000

284.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1156
Changed00
Inserted00
Removed00

284.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

284.4 Active regular expressions

No regular expressions were active.

284.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 //  Common 7 //  Common
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 & when (@media-common = true) { 10 & when (@media-common = true) {
11  11 
12     // 12     //
13     //  Checkout Estimated Total 13     //  Checkout Estimated Total
14     //  --------------------------------------------- 14     //  ---------------------------------------------
15  15 
16     .opc-estimated-wrapper { 16     .opc-estimated-wrapper {
17         &:extend(.abs-no-display-desktop all); 17         &:extend(.abs-no-display-desktop all);
18         &:extend(.abs-add-clearfix all); 18         &:extend(.abs-add-clearfix all);
19         .lib-css(border-bottom, @checkout-step-title__border); 19         .lib-css(border-bottom, @checkout-step-title__border);
20         .lib-css(border-top, @checkout-step-title__border); 20         .lib-css(border-top, @checkout-step-title__border);
21         .lib-css(margin, -21px -(@checkout-step-content-mobile__margin-s) @checkout-step-content-mobile__margin-s); 21         .lib-css(margin, -21px -(@checkout-step-content-mobile__margin-s) @checkout-step-content-mobile__margin-s);
22         padding: 18px 15px; 22         padding: 18px 15px;
23  23 
24         .estimated-block { 24         .estimated-block {
25             .lib-css(font-size, @checkout-step-title-mobile__font-size); 25             .lib-css(font-size, @checkout-step-title-mobile__font-size);
26             float: left; 26             float: left;
27             font-weight: 600; 27             font-weight: 600;
28  28 
29             .estimated-label { 29             .estimated-label {
30                 display: block; 30                 display: block;
31                 margin: 0 0 @indent__xs; 31                 margin: 0 0 @indent__xs;
32             } 32             }
33             .estimated-price { 33             .estimated-price {
34                 color: @theme-color; 34                 color: @theme-color;
35             } 35             }
36         } 36         }
37  37 
38         .minicart-wrapper { 38         .minicart-wrapper {
39             float: right; 39             float: right;
40             button { 40             button {
41                 // todo ui: Change .action.showcart to .action-showcart 41                 // todo ui: Change .action.showcart to .action-showcart
42                 &.action.showcart { 42                 &.action.showcart {
43                     .lib-button-reset(); 43                     .lib-button-reset();
44                     height: auto; 44                     height: auto;
45                     .counter.qty { 45                     .counter.qty {
46                       right: 9px; 46                       right: 9px;
47                       top: 3px; 47                       top: 3px;
48                     } 48                     }
49                     &::before { 49                     &::before {
50                       content: '\e8ba'; 50                       content: '\e8ba';
51                       font-family: 'porto-icons'; 51                       font-family: 'porto-icons';
52                       font-size: 27px; 52                       font-size: 27px;
53                       display: inline-block; 53                       display: inline-block;
54                       color: #222529; 54                       color: #222529;
55                       width: 40px; 55                       width: 40px;
56                       height: 40px; 56                       height: 40px;
57                     } 57                     }
58                     &::after { 58                     &::after {
59                       margin: 0; 59                       margin: 0;
60                     } 60                     }
61                     &:hover { 61                     &:hover {
62                       color: #777; 62                       color: #777;
63                     } 63                     }
64                 } 64                 }
65             } 65             }
66         } 66         }
67     } 67     }
68 } 68 }
69  69 
70 // 70 //
71 //  Desktop 71 //  Desktop
72 //  _____________________________________________ 72 //  _____________________________________________
73  73 
74 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 74 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
75     .opc-estimated-wrapper { 75     .opc-estimated-wrapper {
76         display: none; 76         display: none;
77     } 77     }
78 } 78 }