381. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:20 +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.

381.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Magento_Checkout/web/css/source/module/checkout_checkout.less2016-05-15 23:41:44 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Magento_Checkout/web/css/source/module/checkout_checkout.less2021-02-04 08:08:16 +0000

381.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged7208
Changed431
Inserted13
Removed11

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

381.4 Active regular expressions

No regular expressions were active.

381.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-wrapper__margin: @indent__base; 10 @checkout-wrapper__margin: @indent__base;
11 @checkout-wrapper__columns: 16; 11 @checkout-wrapper__columns: 16;
12  12 
13 @checkout-step-title__border: @border-width__base solid @color-gray80; 13 @checkout-step-title__border: @border-width__base solid @color-gray80;
14 @checkout-step-title__font-size: 22px; 14 @checkout-step-title__font-size: 1rem;
15 @checkout-step-title__font-weight: @font-weight__light; 15 @checkout-step-title__font-weight: @font-weight__light;
16 @checkout-step-title__padding: @indent__s; 16 @checkout-step-title__padding: @indent__s;
17  17 
18 @checkout-step-title-mobile__font-size: 18px; 18 @checkout-step-title-mobile__font-size: 1rem;
19  19 
20 @checkout-step-content-mobile__background: @color-gray-light01; 20 @checkout-step-content-mobile__background: @color-gray-light01;
21 @checkout-step-content-mobile__margin-s: 15px; 21 @checkout-step-content-mobile__margin-s: 15px;
22 @checkout-step-content-mobile__margin: @indent__base -(@checkout-step-content-mobile__margin-s) @checkout-step-content-mobile__margin-s; 22 @checkout-step-content-mobile__margin: @indent__base -(@checkout-step-content-mobile__margin-s) @checkout-step-content-mobile__margin-s;
23  23 
24 // 24 //
25 //  Common 25 //  Common
26 //  _____________________________________________ 26 //  _____________________________________________
27  27 
28 & when (@media-common = true) { 28 & when (@media-common = true) {
29  29 
30     .checkout-index-index, 30     .checkout-index-index,
31     .checkout-onepage-success { 31     .checkout-onepage-success {
32         .page-title-wrapper { 32         .page-title-wrapper {
33             &:extend(.abs-visually-hidden all); 33             &:extend(.abs-visually-hidden all);
34         } 34         }
35     } 35     }
36  36 
37     .checkout-container { 37     .checkout-container {
38         &:extend(.abs-add-clearfix all); 38         &:extend(.abs-add-clearfix all);
39         .lib-css(margin, 0 0 @checkout-wrapper__margin); 39         .lib-css(margin, 1.5rem 0 @checkout-wrapper__margin);
    40     }
    41     .checkout-success {
    42       padding: 30px 0;
    43     }
    44     .cart-empty {
    45       i.cart-empty {
    46           font-size: 100px;
    47           color: #d3d3d4;
    48       }
    49       .btn-go-shop {
    50         min-width: 200px;
    51         padding: 16px 0;
    52         font-size: 15px;
    53         letter-spacing: -.015em;
    54         text-align: center;
    55         color: #fff;
    56         background-color: #222529;
    57         border: none;
    58         line-height: 1.5;
    59         font-weight: 700;
    60         text-transform: uppercase;
    61         display: inline-block;
    62       }
40     } 63     }
41     
42     .opc-wrapper { 64     .opc-wrapper {
43         .lib-css(margin, 0 0 @checkout-wrapper__margin); 65         .lib-css(margin, 0 0 @checkout-wrapper__margin);
44  66 
45         .opc { 67         .opc {
46             &:extend(.abs-reset-list all); 68             &:extend(.abs-reset-list all);
47         } 69         }
48  70 
49         .step-title { 71         .step-title {
50             &:extend(.abs-checkout-title all); 72             &:extend(.abs-checkout-title all);
    73             text-transform: uppercase;
    74             font-weight: 600;
    75             color: #222529;
51             .lib-css(border-bottom, @checkout-step-title__border); 76             .lib-css(border-bottom, @checkout-step-title__border);
52         } 77         }
53  78 
54         .step-content { 79         .step-content {
55             margin: 0 0 @indent__xl; 80             margin: 0 0 @indent__xl;
56         } 81         }
57     } 82     }
58  83 
59     .checkout-index-index { 84     .checkout-index-index {
60         .nav-sections, 85         .nav-sections,
61         .nav-toggle, 86         .nav-toggle,
62         .header.panel { 87         .header.panel {
63              88 
64         } 89         }
65         .logo { 90         .logo {
66             margin-right: 0; 91             margin-right: 0;
67         } 92         }
68     } 93     }
69 } 94 }
70  95 
71 // 96 //
72 //  Mobile 97 //  Mobile
73 //  _____________________________________________ 98 //  _____________________________________________
74  99 
75 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 100 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
76     .opc-wrapper { 101     .opc-wrapper {
77         .step-title { 102         .step-title {
78             .lib-css(font-size, @checkout-step-title-mobile__font-size); 103             .lib-css(font-size, @checkout-step-title-mobile__font-size);
79             border-bottom: 0; 104             border-bottom: 0;
80             padding-bottom: 0; 105             padding-bottom: 0;
81         } 106         }
82         .step-content { 107         .step-content {
83             .lib-css(margin, 0 0 @checkout-step-content-mobile__margin-s); 108             .lib-css(margin, 0 0 @checkout-step-content-mobile__margin-s);
84         } 109         }
85     } 110     }
86 } 111 }
87 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { 112 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
88     .checkout-index-index { 113     .checkout-index-index {
89         .page-header .minicart-wrapper { 114         .page-header .minicart-wrapper {
90             display: none; 115             display: none;
91         } 116         }
92     } 117     }
93     .page-header.type5 .block-search .label { 118     .page-header.type5 .block-search .label {
94         margin-left: 0; 119         margin-left: 0;
95     } 120     }
96 } 121 }
97 // 122 //
98 //  Desktop 123 //  Desktop
99 //  _____________________________________________ 124 //  _____________________________________________
100  125 
101 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 126 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
102     .opc-wrapper { 127     .opc-wrapper {
103        &:extend(.abs-add-box-sizing-desktop-m all); 128        &:extend(.abs-add-box-sizing-desktop-m all);
104         .lib-layout-column(2, 1, @checkout-wrapper__columns); 129         .lib-layout-column(2, 1, @checkout-wrapper__columns);
105         float: right; 130         float: right;
106         width: 66%; 131         width: 66%;
107         padding-left: @indent__l; 132         padding-left: @indent__l;
108     } 133     }
109 } 134 }

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.