326. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01: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.

326.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto_rtl/web/css/source_layout.less2021-06-11 01:10:00 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto_rtl/web/css/source_layout.less2021-06-11 01:10:00 +0000

326.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1270
Changed00
Inserted00
Removed00

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

326.4 Active regular expressions

No regular expressions were active.

326.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 @layout-column-main__sidebar-offset: 2%; 6 @layout-column-main__sidebar-offset: 2%;
7 @layout-column__additional-sidebar-offset: @layout-column-main__sidebar-offset; 7 @layout-column__additional-sidebar-offset: @layout-column-main__sidebar-offset;
8  8 
9 // 9 //
10 //    Common 10 //    Common
11 //-------------------------------------- 11 //--------------------------------------
12  12 
13 & when (@media-common = true) { 13 & when (@media-common = true) {
14  14 
15 .columns { 15 .columns {
16     #lib-layout-columns(); 16     #lib-layout-columns();
17     .column.main { 17     .column.main {
18         &:extend(.abs-add-box-sizing all); 18         &:extend(.abs-add-box-sizing all);
19         .lib-vendor-prefix-flex-grow(1); 19         .lib-vendor-prefix-flex-grow(1);
20         .lib-vendor-prefix-flex-basis(100%); 20         .lib-vendor-prefix-flex-basis(100%);
21         .lib-vendor-prefix-order(1); 21         .lib-vendor-prefix-order(1);
22         max-width: 100%; 22         max-width: 100%;
23     } 23     }
24     .sidebar-main { 24     .sidebar-main {
25         &:extend(.abs-add-box-sizing all); 25         &:extend(.abs-add-box-sizing all);
26         .lib-vendor-prefix-flex-grow(1); 26         .lib-vendor-prefix-flex-grow(1);
27         .lib-vendor-prefix-flex-basis(100%); 27         .lib-vendor-prefix-flex-basis(100%);
28         .lib-vendor-prefix-order(1); 28         .lib-vendor-prefix-order(1);
29         max-width: 100%; 29         max-width: 100%;
30     } 30     }
31     .sidebar-additional { 31     .sidebar-additional {
32         &:extend(.abs-add-box-sizing all); 32         &:extend(.abs-add-box-sizing all);
33         .lib-vendor-prefix-flex-grow(1); 33         .lib-vendor-prefix-flex-grow(1);
34         .lib-vendor-prefix-flex-basis(100%); 34         .lib-vendor-prefix-flex-basis(100%);
35         .lib-vendor-prefix-order(2); 35         .lib-vendor-prefix-order(2);
36         max-width: 100%; 36         max-width: 100%;
37         padding: 20px 0; 37         padding: 20px 0;
38     } 38     }
39 } 39 }
40  40 
41 .page-main { 41 .page-main {
42     padding-top: 20px; 42     padding-top: 20px;
43     padding-bottom: 40px; 43     padding-bottom: 40px;
44  44 
45     > .page-title-wrapper .page-title { 45     > .page-title-wrapper .page-title {
46         font-size: 20px; 46         font-size: 20px;
47         margin: 0 0 15px; 47         margin: 0 0 15px;
48         color: @theme-color; 48         color: @theme-color;
49     } 49     }
50 } 50 }
51  51 
52 } 52 }
53  53 
54 // 54 //
55 //    Mobile 55 //    Mobile
56 //-------------------------------------- 56 //--------------------------------------
57 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) { 57 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) {
58     .header.content, 58     .header.content,
59     .footer.content, 59     .footer.content,
60     .page-main, 60     .page-main,
61     .page-wrapper > .widget, 61     .page-wrapper > .widget,
62     .page-wrapper > .page-bottom, 62     .page-wrapper > .page-bottom,
63     .block.category.event, 63     .block.category.event,
64     .top-container { 64     .top-container {
65         padding-left: 10px; 65         padding-left: 10px;
66         padding-right: 10px; 66         padding-right: 10px;
67     } 67     }
68     .page-main { 68     .page-main {
69         .account &, 69         .account &,
70         .cms-privacy-policy & { 70         .cms-privacy-policy & {
71             position: relative; 71             position: relative;
72             padding-top: 41px; 72             padding-top: 41px;
73         } 73         }
74     } 74     }
75 } 75 }
76  76 
77 // 77 //
78 //    Desktop 78 //    Desktop
79 //-------------------------------------- 79 //--------------------------------------
80 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { 80 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
81     .navigation, 81     .navigation,
82     .header.content, 82     .header.content,
83     .footer.content, 83     .footer.content,
84     .page-wrapper > .widget, 84     .page-wrapper > .widget,
85     .page-wrapper > .page-bottom, 85     .page-wrapper > .page-bottom,
86     .block.category.event, 86     .block.category.event,
87     .top-container, 87     .top-container,
88     .page-main { 88     .page-main {
89         padding-left: 10px; 89         padding-left: 10px;
90         padding-right: 10px; 90         padding-right: 10px;
91         margin-left: auto; 91         margin-left: auto;
92         margin-right: auto; 92         margin-right: auto;
93         width: auto; 93         width: auto;
94         max-width: @layout__max-width; 94         max-width: @layout__max-width;
95         box-sizing: border-box; 95         box-sizing: border-box;
96     } 96     }
97     .page-main { 97     .page-main {
98         width: 100%; 98         width: 100%;
99         .lib-vendor-prefix-flex-grow(1); 99         .lib-vendor-prefix-flex-grow(1);
100         .lib-vendor-prefix-flex-shrink(0); 100         .lib-vendor-prefix-flex-shrink(0);
101         .lib-vendor-prefix-flex-basis(auto); 101         .lib-vendor-prefix-flex-basis(auto);
102         .ie9 & { 102         .ie9 & {
103             width: auto; 103             width: auto;
104         } 104         }
105     } 105     }
106  106 
107     .columns { 107     .columns {
108         display: block; 108         display: block;
109     } 109     }
110  110 
111     .column.main { 111     .column.main {
112         #lib-layout-columns > .main(); 112         #lib-layout-columns > .main();
113         &:extend(.abs-add-box-sizing-desktop all); 113         &:extend(.abs-add-box-sizing-desktop all);
114         min-height: 300px; 114         min-height: 300px;
115     } 115     }
116  116 
117     .sidebar-main { 117     .sidebar-main {
118         #lib-layout-columns > .right(); 118         #lib-layout-columns > .right();
119         padding-left: @layout-column-main__sidebar-offset; 119         padding-left: @layout-column-main__sidebar-offset;
120         &:extend(.abs-add-box-sizing-desktop all); 120         &:extend(.abs-add-box-sizing-desktop all);
121     } 121     }
122     .sidebar-second { 122     .sidebar-second {
123       #lib-layout-columns > .left(); 123       #lib-layout-columns > .left();
124       padding-right: @layout-column-main__sidebar-offset; 124       padding-right: @layout-column-main__sidebar-offset;
125       &:extend(.abs-add-box-sizing-desktop all); 125       &:extend(.abs-add-box-sizing-desktop all);
126     } 126     }
127     .page-layout-2columns-right .sidebar-main { 127     .page-layout-2columns-right .sidebar-main {
128         padding-left: 0; 128         padding-left: 0;
129         padding-right: @layout-column-main__sidebar-offset; 129         padding-right: @layout-column-main__sidebar-offset;
130     } 130     }
131  131 
132     .panel.header { 132     .panel.header {
133         padding: 10px 20px; 133         padding: 10px 20px;
134     } 134     }
135 } 135 }