555. Araxis Merge File Comparison Report

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

555.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype2.css2019-11-01 12:14:10 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype2.css2021-04-28 05:17:24 +0000

555.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged36
Changed3396
Inserted00
Removed00

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

555.4 Active regular expressions

No regular expressions were active.

555.5 Comparison detail

1 .page-header.type2:not(.header-newskin){background-color:#0083c1;color:#fff;border:0} 1 .page-header .panel.wrapper {position: relative;}
2 .page-header.type2 .header.panel>.header.links>li>a{color:#fff} 2 .page-header .panel.wrapper::after {content: '';display: block;position: absolute;bottom: 0;left: 0;right: 0;border-bottom: 1px solid #0e95d8;}
3 .page-header.type2 .header.panel>.header.links>li>a:hover{color:#fff} 3 .page-header .panel.wrapper .header-right > * {margin-left: .875rem;margin-right: 0;}
4 .page-header.type2 .minicart-wrapper{position:absolute;top:50%;right:15px;margin-top:-20px} 4 
.page-header.type2 
{border-bottom: 1px solid #f4f4f4;}
5 .page-header.type2 .minicart-wrapper .action.showcart:before,.page-header.type2 .minicart-wrapper .action.showcart.active:before{color:#fff} 5 .page-header.type2 .main-panel-top .panel.header+.gap {height: 1.6em;}
6 .page-header.type2:not(.header-newskin) .minicart-wrapper .action.showcart .counter.qty{color:#000} 6 
.page-header.type2 .panel.header .switcher {margin-right: 0;margin-left: .875rem;}
7  7 
.page-header.type2 .panel.header .switcher:first-child {margin-left: 0;}
8 @media only screen and (max-width:767px){ 8 .page-header.type2 .main-panel-top .share-links a {width: 26px;height: 26px;margin: 0 1px;display: inline-block;}
9     .page-header.type2 .nav-toggle{float:left} 9 
.page-header.type2 .main-panel-top .separator {height: 1.6em;border-left: 1px solid rgba(255,255,255,
.09);display:
 inline-block;vertical-align: middle;}
10     .page-header.type2 .logo{height:40px;float:left;margin:10px 0} 10 .page-header.type2 .header-row .header-center {padding-left: 0;padding-right: 0;}
11     .page-header.type2 .logo img{max-width:100%;max-height:100%;width:auto} 11 .page-header.type2 .header-contact > * {margin-left: .875rem;}
12     .page-header.type2 .minicart-wrapper{position:relative;top:auto;right:auto;left:auto;margin:10px 0;float:right} 12 .page-header.type2 .header-contact {display: inline-flex;align-items: center;line-height: 22px;font-size: .9em;}
13     .page-header.type2 .block-search{float:none;margin-bottom:0} 13 
.page-header.type2 .header-contact .my-account {display: inline-block;padding: 0 .125rem;font-size: 24px;vertical-align: middle;}
14     .page-header.type2 .block-search .label{float:right;margin:10px 0;line-height:40px;margin-right:10px} 14 .page-header.type2 .header-contact .my-account i,.page-header.type2 .header-contact .wishlist i {font-size: 27px;display: block;margin: 0;}
15     .page-header.type2 .block-search .label:before{color:#fff;cursor:pointer} 15 .page-header.type2 .header-contact p {margin: 0;}
16     .page-header.type2 .custom-block{display:none} 16 .page-header.type2
 .minicart-wrapper {margin-left: .875rem;}
17     .page-header.type2 .nav-toggle:before{color:#fff} 17 .page-header.type2 .search-area {padding-left: 17px;max-width: 100%;}
18     .page-header.type2.header-newskin .block-search .label:before { 18 .page-header.type2 .custom-block {margin-left: 0;}
19         content: '\e884'; 19 .page-header.type2 .search-area .minisearch .actions button {width: 38px;height: 42px;}
20         font-weight: 900; 20 .page-header.type2 .search-category {right: 41px !important;height: 42px;line-height: 42px;padding-right: 12px;padding-left: 16px;}
21     } 21 .page-header.type2 .search-category:after {margin-left: 7px;}
22 } 22 .page-header.type2 .block-search input {height: 42px;font-size: inherit;}
23 @media all and (min-width:768px),print{ 23 .page-header.type2 .block-search input::placeholder {color: #777; opacity: .7;}
24     header.page-header.sticky-header.type2 .minicart-wrapper .action.showcart:before{color:#fff} 24 @media (max-width:991px){
25     header.page-header.sticky-header.type2 .minicart-wrapper .action.showcart .counter.qty{} 25   .page-header.type2
 .minicart-wrapper {margin-left: .875rem;}
26     .page-header.type2:not(.header-newskin){background-color:#0083c1;color:#fff;border-top:0} 26   .page-header.type2 .custom-block {display: none;}
27     .page-header.type2>.panel.wrapper{background-color:#008acc;color:#fff}    
28     .page-header.type2:not(.header-newskin) .panel.header .switcher{border-left:1px solid rgba(255,255,255,0.5);padding:0 15px;text-transform:uppercase}    
29     .page-header.type2 .panel.header .switcher:first-child{border-left:
0;padding-left:0}		    
30     .page-header.type2 .panel.header .switcher:last-child
{padding-right:
0
}		    
31     .page-header.type2 .panel.header .header.links>li>a{color:#fff}    
32     .page-header.type2 .panel.header .header.links>li>a:hover{color:#fff}    
33     .page-header.type2 .customer-welcome .action.switch{color:#fff}    
34     .page-header.type2 .nav-sections{background-color:#006fa4;color:#fff}    
35     .page-header.type2 .navigation .level0.parent>a:after{line-height:44px}    
36     .page-header.type2 .navigation .level0>.level-top{color:#fff;font-weight:700}    
37     .page-header.type2 .block-search input{background-color:#006393;color:#ddd}    
38     .page-header.type2 .block-search .action.search{
border-left:
1px solid rgba(255,255,255,0.2);padding:0 12px}		    
39     .page-header.type2 .block-search .action.search:focus:before{color:#fff}    
40     .page-header.type2 .block-search .action.search:before,.page-header.type2 .block-search .action.search:hover:before{color:#fff}    
41     .page-header.type2 .block-search .action.search:hover{border-left-width:1px}    
42     .page-header.type2 .custom-block{height:40px;line-height:40px;position:absolute;top:50%;right:60px;margin-top:-20px;font-size:14px;color:#fff}    
43     .page-header.type2 .custom-block>*{display:
inline-block;
vertical-align:
middle
}		    
44     .page-header.type2 .custom-block>a{font-size:12px;color:#fff}    
45 }    
46     
47 .page-header.type2
.header-newskin {
    
48     background-color: #0083c1;    
49     color: #fff;    
50     border-top-width: 0;    
51 }    
52 .page-header.type2.header-newskin .minicart-wrapper {
    
53     position: absolute;    
54     top: 50%;    
55     right: 15px;    
56     margin-top: -20px;    
57 }    
58 .page-header.type2.header-newskin .minicart-wrapper .block-minicart:before {    
59     right: 56px;    
60 }    
61 .page-header.type2.header-newskin .minicart-wrapper .block-minicart:after {    
62     right: 55px;    
63 }    
64 .page-header.type2.header-newskin.sticky-header .minicart-wrapper .block-minicart:before {    
65     right: 36px;    
66 }    
67 .page-header.type2.header-newskin.sticky-header .minicart-wrapper .block-minicart:after {    
68     right: 35px;    
69 }    
70 .page-header.type2.header-newskin .minicart-wrapper .action.showcart {    
71     line-height: 37px;    
72     color: #606669;    
73     padding-right: 20px;    
74 }    
75 .page-header.type2.header-newskin .minicart-wrapper .action.showcart:before, .page-header.type2.header-newskin .minicart-wrapper .action.showcart.active:before {    
76     color: #fff;    
77     font-size: 25px;    
78     line-height: 40px;    
79 }    
80 .page-header.type2.header-newskin .minicart-wrapper .action.showcart .counter.qty {    
81     background-color: #f17734;    
82     right: 13px;    
83     margin-top: -17px;    
84     line-height: 17px;    
85 }    
86 .page-header.type2.header-newskin .minicart-wrapper .action.showcart:after {    
87     color: #bde1f5;    
88     -webkit-font-smoothing: inherit;    
89 }    
90 .page-header.type2.header-newskin .minicart-wrapper .action.close {    
91     top: 5px;    
92 }    
93 
.page-header.type2.header-newskin.sticky-header .minicart-wrapper {
    
94     background: transparent;    
95     box-shadow: none;    
96     border-color: transparent;    
97     width: auto;    
98 } 27 }
99 .page-header.type2.header-newskin.sticky-header .minicart-wrapper .action.showcart { 28 @media only screen and (max-width:
767px)
{
100     padding-right: 15px; 29   .page-header.type2 .main-panel-top .separator {display: none;}
101 }    
102 .page-header.type2.header-newskin.sticky-header .minicart-wrapper .action.showcart:after {    
103     display: none;    
104 }    
105 .page-header.type2.header-newskin.sticky-header .minicart-wrapper .action.showcart .counter.qty {    
106     right: 8px;    
107 }    
108 .page-header.type2.header-newskin .nav-toggle {    
109     float: left;    
110 }    
111 @media (min-width: 768px) {    
112     .page-header.type2.header-newskin {    
113         background-color: #0088cc;    
114         color: #fff;    
115     }    
116     .page-header.type2.header-newskin .switcher strong {    
117         font-weight: 600;    
118     }    
119     .page-header.type2.header-newskin > .main-panel-top {    
120         background-color: #0088cc;    
121     }    
122     .page-header.type2.header-newskin .panel.wrapper {    
123         background-color: transparent;    
124         color: #bde1f5;    
125     }    
126     .page-header.type2.header-newskin .panel.header {    
127         max-width: 100%;    
128         padding: 10px 0;    
129     }    
130     .page-header.type2.header-newskin .panel.header .switcher {    
131         padding-right: 25px;    
132         text-transform: uppercase;    
133     }    
134     .page-header.type2.header-newskin .main-panel-inner {    
135         border-bottom: 1px solid rgba(248,248,248,0.2);    
136     }    
137     .page-header.type2.header-newskin .panel.header .header.links > li {    
138         color: #bde1f5;    
139         font-weight: 600;    
140         letter-spacing: 0.025em;    
141     }    
142     .page-header.type2.header-newskin .panel.header .header.links > li > a {    
143         border: none;    
144         color: #bde1f5;    
145         font-weight: 600;    
146         letter-spacing: 0.025em;    
147     }    
148     .page-header.type2.header-newskin .block-search {    
149         margin-left: 150px;    
150     }    
151     .page-header.type2.header-newskin .block-search input {    
152         background-color: #fff;    
153         color: #8d8d8d;    
154         border-radius: 20px;    
155         border: 1px solid #dbe0e2;    
156     }    
157     .page-header.type2.header-newskin .block-search .field.search {    
158         background-color: #fff;    
159         border-radius: 20px;    
160     }    
161     .page-header.type2.header-newskin .block-search .action.search {    
162         border-left: 1px solid rgba(255,255,255,0.2);    
163         padding: 0 17px;    
164     }    
165     .page-header.type2.header-newskin .block-search .action.search:before {    
166         content: '\e884';    
167         color: #606669;    
168         font-size: 16px;    
169         padding-left: 1px;    
170     }    
171     .page-header.type2.header-newskin .block-search .action.search:hover:before {    
172         color: #606669;    
173     }    
174     .page-header.type2.header-newskin .custom-block {    
175         position: absolute;    
176         top: 50%;    
177         right: 170px;    
178         margin-top: -15px;    
179         font-size: 14px;    
180         color: #bde1f5;    
181     }    
182     .page-header.type2.header-newskin .custom-block > * {    
183         display: inline-block;    
184         vertical-align: top;    
185         font-size: 11px;    
186         font-weight: 600;    
187         text-align: left;    
188         line-height: 1;    
189     }    
190     .page-header.type2.header-newskin .minicart-wrapper {    
191         background-color: #0694db;    
192         width: 81px;    
193         height: 41px;    
194         text-align: center;    
195         box-shadow: 0px 5px 11px -2px rgba(0, 0, 0, 0.1);    
196         border-radius: 2px;    
197         border: solid 1px #0082c2;    
198     }    
199     .page-header.type2.header-newskin .nav-sections {    
200         background-color: #f4f4f4;    
201         color: #6b7a83;    
202     }    
203     .page-header.type2.header-newskin.sticky-header .nav-sections {    
204         background-color: #0088cc;    
205         color: #fff;    
206     }    
207     .page-header.type2.header-newskin.sticky-header .navigation li.level0.active, .page-header.type2.header-newskin.sticky-header .navigation li.level0:hover {    
208         color: #bde1f5;    
209     }    
210     header.page-header.type2.header-newskin.sticky-header .navigation li.level0 > .level-top {    
211         padding: 0 10px;    
212     }    
213     .page-header.type2.header-newskin .navigation .level0 {margin-right: 4px;color: inherit;}    
214     .page-header.type2.header-newskin .navigation .level0 > .level-top {    
215         font-size: 12px;    
216         letter-spacing: inherit;    
217         color: inherit;    
218         font-weight: 700;    
219     }    
220     .page-header.type2.header-newskin .navigation li.level0.active,    
221     .page-header.type2.header-newskin .navigation li.level0:hover {    
222         color: #0088cc;    
223     }    
224     .page-header.type2.header-newskin .navigation li.level0.parent:hover a.level-top:before {    
225         display: none;    
226     }    
227     .page-header.type2.header-newskin .navigation li.level0 .submenu:before {    
228         content: "";    
229         width: 100%;    
230         height: 20px;    
231         display: block;    
232         position: absolute;    
233         left: 0;    
234         top: -15px;    
235     }    
236     .page-header.type2.header-newskin .navigation .level0 .submenu li.parent > a:after {    
237         line-height: 25px;    
238     }    
239     .page-header.type2.header-newskin.sticky-header .navigation li.level0 > .submenu {    
240         top: 37px;    
241     }    
242 }    
243 @media (min-width: 768px) {    
244     .page-header.type2.header-newskin .header.panel > .header.links {    
245         float: none;    
246         text-align: right;    
247         display: block;    
248     }    
249     .page-header.type2.header-newskin .header.panel > .header.links > li.compare {    
250         float: left;    
251     }    
252     .page-header.type2.header-newskin .header.panel > .header.links > li.compare > a {    
253         padding: 0;    
254     }    
255     .page-header.type2.header-newskin .sw-megamenu.navigation li.level0.fl-right {    
256         /*float: none;*/    
257     }    
258 }    
259 @media (max-width: 1199px) {    
260     .page-header.type2.header-newskin .block-search {    
261         margin-left: 30px;    
262     }    
263     .page-header.type2.header-newskin .custom-block {    
264         right: 150px;    
265     }    
266 }    
267 @media (max-width: 991px) {    
268     .page-header.type2.header-newskin .header.panel > .header.links > li > a, .page-header.type2.header-newskin .header.panel > .header.links > li > span {    
269         padding: 0 7px;    
270     }    
271     .page-header.type2.header-newskin .header.panel > .header.links > li:first-child > a, .page-header.type2.header-newskin .header.panel > .header.links > li:first-child > span {    
272         padding-left: 0;    
273     }    
274     .page-header.type2.header-newskin .header.panel > .header.links > li:last-child > a, .page-header.type2.header-newskin .header.panel > .header.links > li:last-child > span {    
275         padding-right: 0;    
276     }    
277     .page-header.type2.header-newskin .panel.header .switcher {    
278         padding-right: 15px;    
279     }    
280     .page-header.type2.header-newskin .navigation .level0 > .level-top {    
281         padding-left: 10px;    
282         padding-right: 10px;    
283     }    
284 }    
285 @media 
(max-width: 767px) {		    
286     .page-header.type2.header-newskin .logo {    
287         height: 40px;    
288         float: left;    
289         margin: 10px 0;    
290     }    
291     .page-header.type2.header-newskin .logo img {    
292         max-width: 100%;    
293         max-height: 100%;    
294         width: auto;    
295     }    
296     .page-header.type2.header-newskin .minicart-wrapper {    
297         position: relative;    
298         top: auto;    
299         right: auto;    
300         left: auto;    
301         margin: 10px 0;    
302         float: right;    
303     }    
304     .page-header.type2.header-newskin .block-search {    
305         float: none;    
306         margin-bottom: 0;    
307     }    
308     .page-header.type2.header-newskin .block-search .label:before,    
309     .page-header.type2.header-newskin .nav-toggle:before {    
310         color: #fff;    
311         font-size: 20px;    
312         padding-left: 1px;    
313     }    
314     .page-header.type2.header-newskin .block-search .label:before {    
315         margin-top: -5px;    
316     }    
317     .page-header.type2.header-newskin .block-search .label {    
318         float: right;    
319         margin: 10px 0;    
320         line-height: 40px;    
321         margin-right: 13px;    
322     }    
323     .page-header.type2.header-newskin .custom-block {    
324         display: none;    
325     }    
326     header.page-header.type2.header-newskin .minicart-wrapper .action.showcart:before, header.page-header.type2.header-newskin .minicart-wrapper .action.showcart.active:before {    
327         font-size: 25px;    
328     }    
329 }    
330 header.page-header.type2 .search-category {    
331     margin-right: 15px;    
332 }    
333 header.page-header.type2 .search-category select {    
334     border-top-color: transparent;    
335     border-bottom-color: transparent;    
336 }    
337 header.page-header.type2 a.action.my-wishlist {    
338     color: #fff;    
339     font-size: 24px;    
340     position: absolute;    
341     top: 50%;    
342     right: 70px;    
343     margin-top: -15px;    
344     display: none;    
345 }    
346 @media (max-width: 767px) {    
347     header.page-header.type2 a.action.my-wishlist {    
348         position: static;    
349         float: right;    
350         margin: 12px 18px 12px 0;    
351     }    
352 } 30 }
353 header.page-header.type2.sticky-header a.action.my-wishlist {
 31 @media all and (min-width:992px) {
354     color: #222529; 32   .page-header.type2 .header.panel > .header.links {display: flex;align-items: center;}
    33   .page-header.type2 .header.panel > .header.links > li > a {padding-top: 8px;padding-bottom: 8px;padding-left: 16px;padding-right: 8px;text-transform: none;}
    34   .page-header.type2 .search-area .block.block-search {border: none;}
    35   .page-header.type2 .nav-sections {display: block;align-items: center;min-height: 60px;}
    36   .page-header.type2 .nav-sections .nav-sections-items {flex: 0 0 100%;}
    37   .page-header.type2.sticky-header 
.navigation {padding-right: 80px;}
    38   .page-header.type2 .sticky-logo {margin-top: 0;}
    39   .page-header.type2 .navigation:not(.side-megamenu) > ul {display: block;align-items: center;flex-wrap: wrap;}
    40   .page-header.type2 .navigation:not(.side-megamenu) .level0 {margin-right: 35px;}
    41   .page-header.type2 .navigation:not(.side-megamenu) .level0:not(:first-child) {margin-left: -3.3px;}
    42   .page-header.type2 .navigation:not(.side-megamenu) .level0.f-right {margin-right: 0;}
    43   .page-header.type2 .navigation:not(.side-megamenu) .level0.f-right {margin-left: 35px;}
    44   .page-header.type2 .navigation:not(.side-megamenu) .level0 .level-top {font-size: 12px;font-weight: 700;line-height: 18px;letter-spacing:-.12px;padding: 20px 0 20px 0;}
    45   .page-header .sw-megamenu.navigation li.level0.staticwidth > .submenu .level1 > a,
    46   .page-header .sw-megamenu.navigation li.level0.fullwidth > .submenu .level1 > a {color: #333;}
355 } 47 }

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