131. Araxis Merge File Comparison Report

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

131.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/import	demo18_old.xml	2019-12-13 09:07:36 +0000
2			2021-05-13 09:08:51 +0000

131.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	814

131.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

131.4 Active regular expressions

No regular expressions were active.

131.5 Comparison detail

1		<root>
2		<config>
3
4		<web>
5
6		<default>
7
8		<cms_home_page>
9		porto_home_18_old
10		</cms_home_page>
11
12		<cms_no_route>
13		no-route-2
14		</cms_no_route>
15
16		</default>
17
18		</web>
19
20		<cms>
21
22		<wysiwyg>
23
24		<enabled>
25		hidden
26		</enabled>
27
28		</wysiwyg>
29
30		</cms>
31		»
32		<design>
33		» »
34		<header>
35		» » »
36		<logo_width>
37		</logo_width>
38		» » »
39		<logo_height>
40		</logo_height>
41		» » »
42		<logo_src>
43		default/logo_orange.png
44		</logo_src>
45		» »
46		</header>
47		»
48		</design>
49		»
50		<dev>
51		» »
52		<js>
53		» » »
54		<merge_files>
55		1
56		</merge_files>
57		» »
58		</js>
59		»
60		</dev>
61
62		<porto_settings>
63
64		<general>
65
66		<boxed>
67		wide
68		</boxed>
69
70		<layout>
71		1140
72		</layout>
73
74		<disable_border_radius>
75		1
76		</disable_border_radius>
77
78		<show_site_notice>
79		0
80		</show_site_notice>
81
82		</general>
83
84		<header>
85
86		<header_type>
87		5
88		</header_type>
89
90		<new_skin>
91		0
92		</new_skin>
93
94		<static_block>
95		porto_custom_block_for_header
96		</static_block>
97
98		<sticky_header_logo>
99		</sticky_header_logo>
100
101		</header>
102
103		<footer>
104
105		<footer_top>
106		0
107		</footer_top>
108
109		<footer_top_block>
110		custom
111		</footer_top_block>
112
113		<footer_top_custom>
114		porto_footer_top_custom_block
115		</footer_top_custom>
116
117		<footer_middle>
118		1
119		</footer_middle>
120
121		<footer_ribbon>
122		0
123		</footer_ribbon>
124
125		<footer_ribbon_text>
126		Ribbon Text
127		</footer_ribbon_text>
128
129		<footer_middle_column_1>
130		custom
131		</footer_middle_column_1>
132
133		<footer_middle_column_1_custom>
134		porto_footer_links
135		</footer_middle_column_1_custom>
136
137		<footer_middle_column_1_size>
138		3
139		</footer_middle_column_1_size>
140
141		<footer_middle_column_2>
142		custom
143		</footer_middle_column_2>
144
145		<footer_middle_column_2_custom>
146		porto_footer_contact_information
147		</footer_middle_column_2_custom>
148
149		<footer_middle_column_2_size>
150		3
151		</footer_middle_column_2_size>
152
153		<footer_middle_column_3>
154		custom
155		</footer_middle_column_3>
156
157		<footer_middle_column_3_custom>
158		porto_footer_features
159		</footer_middle_column_3_custom>
160
161		<footer_middle_column_3_size>
162		3
163		</footer_middle_column_3_size>
164
165		<footer_middle_column_4>
166		newsletter
167		</footer_middle_column_4>
168
169		<footer_middle_column_4_custom>
170		porto_footer_links
171		</footer_middle_column_4_custom>
172
173		<footer_middle_column_4_size>
174		3
175		</footer_middle_column_4_size>
176
177		<footer_middle_2>
178		0
179		</footer_middle_2>
180
181		<footer_middle_2_column_1>
182		custom
183		</footer_middle_2_column_1>
184
185		<footer_middle_2_column_1_custom>
186		porto_footer_links
187		</footer_middle_2_column_1_custom>
188
189		<footer_middle_2_column_1_size>
190		3
191		</footer_middle_2_column_1_size>
192
193		<footer_middle_2_column_2>
194		custom
195		</footer_middle_2_column_2>
196
197		<footer_middle_2_column_2_custom>
198		porto_footer_links
199		</footer_middle_2_column_2_custom>
200
201		<footer_middle_2_column_2_size>
202		3
203		</footer_middle_2_column_2_size>
204
205		<footer_middle_2_column_3>
206		custom
207		</footer_middle_2_column_3>
208
209		<footer_middle_2_column_3_custom>
210		porto_footer_links
211		</footer_middle_2_column_3_custom>
212
213		<footer_middle_2_column_3_size>
214		3
215		</footer_middle_2_column_3_size>
216
217		<footer_middle_2_column_4>
218		custom
219		</footer_middle_2_column_4>
220
221		<footer_middle_2_column_4_custom>
222		porto_footer_links
223		</footer_middle_2_column_4_custom>
224
225		<footer_middle_2_column_4_size>
226		3
227		</footer_middle_2_column_4_size>
228
229		<footer_bottom>
230		1
231		</footer_bottom>
232
233		<footer_store_switcher>
234		0
235		</footer_store_switcher>
236
237		<footer_logo_src>
238		default/logo_footer_light_black.png
239		</footer_logo_src>
240
241		<footer_bottom_copyrights>
242		<![CDATA[©Copyright 2020 by PORTO. All Rights Reserved.]]>
243		</footer_bottom_copyrights>
244
245		<footer_bottom_custom_1>
246		porto_footer_bottom_custom_block
247		</footer_bottom_custom_1>
248
249		<footer_bottom_custom_2>
250		</footer_bottom_custom_2>
251
252		</footer>
253
254		<category>
255
256		<alternative_image>
257		1
258		</alternative_image>
259
260		<aspect_ratio>
261		0
262		</aspect_ratio>
263
264		<ratio_width>
265		300
266		</ratio_width>
267
268		<ratio_height>
269		400
270		</ratio_height>
271
272		<rating_star>
273		1
274		</rating_star>
275
276		<product_price>
277		1
278		</product_price>
279
280		<actions>
281		1
282		</actions>
283
284		<addtocompare>
285		1
286		</addtocompare>
287
288		<addtowishlist>
289		1
290		</addtowishlist>
291
292		<page_layout>
293		2columns-left
294		</page_layout>
295
296		<category_description>
297		main_column
298		</category_description>
299
300		<side_custom_block>
301		porto_category_side_custom_block
302		</side_custom_block>
303
304		</category>
305
306		<category_grid>
307
308		<product_type>
309		1
310		</product_type>
311
312		<columns>
313		4
314		</columns>
315
316		</category_grid>
317
318		<product>
319
320		<product_image_size>
321		6
322		</product_image_size>
323
324		<side_custom_block>
325		porto_product_side_custom_block
326		</side_custom_block>
327
328		<main_custom_block>
329		</main_custom_block>
330
331		<main_custom_block2>
332		</main_custom_block2>
333
334		<move_addtolinks>
335		0
336		</move_addtolinks>
337
338		<move_upsell_full>
339		0
340		</move_upsell_full>
341
342		<page_layout>
343		2columns-right
344		</page_layout>
345
346		<tab_full_background>
347		0
348		</tab_full_background>
349
350		<custom_block_next_tab>
351		</custom_block_next_tab>
352
353		<upsell_columns>
354		4
355		</upsell_columns>
356
357		<move_upsell>
358		0
359		</move_upsell>
360
361		</product>
362		» »
363		<newsletter>
364		» » »
365		<logo_src>
366		default/logo_orange.png
367		</logo_src>
368		» »
369		</newsletter>
370
371		<contacts>
372
373		<enable>
374		1
375		</enable>
376
377		<full_width>
378		0
379		</full_width>
380
381		<address>
382		Porto2 Store
383		</address>
384
385		<latitude>
386		-34.398
387		</latitude>
388
389		<longitude>
390		150.884
391		</longitude>
392
393		<zoom>
394		18
395		</zoom>
396
397		<infoblock>
398		<![CDATA[<div class="row">
399		<div class="col-md-12">
400		<i class="porto-icon-phone"></i>
401		<p>0201 203 2032</p>
402		<p>0201 203 2032</p>
403		</div>
404		</div>
405		<div class="row">
406		<div class="col-md-12">
407		<i class="porto-icon-mobile"></i>
408		<p>201-123-3922</p>
409		<p>302-123-3928</p>
410		</div>
411		</div>
412		<div class="row">
413		<div class="col-md-12">
414		<i class="porto-icon-mail-alt"></i>
415		<p>porto@gmail.com</p>
416		<p>porto@portotemplate.com</p>
417		</div>
418		</div>
419		<div class="row">
420		<div class="col-md-12">
421		<i class="porto-icon-skype"></i>
422		<p>porto_skype</p>
423		<p>proto_template</p>
424		</div>
425		</div>]]>
426		</infoblock>
427
428		<customblock>
429		</customblock>
430
431		</contacts>
432
433		<custom_settings>
434
435		<custom_style>
436		<![CDATA[.footer-middle {
437		border-bottom: 1px solid #dddbdd;
438		}
439		.footer-bottom {
440		border-top: 1px solid #ecebec;
441		}
442		.footer-middle .block.newsletter input {
443		border: 1px solid #ccc;
444		background-color: transparent;
445		border-radius: 4px 0 0 4px;
446		height: 34px;
447		}
448		.footer-middle .block.newsletter .action.subscribe {
449		background-color: transparent;
450		color: #777;
451		height: 34px;
452		line-height: 34px;
453		border: 1px solid #ccc;
454		}
455		.page-header.type6 .panel.header .switcher.currency {
456		border: 0;
457		padding-left: 0;
458		}
459		@media (min-width: 768px) {
460		.cms-index-index .page-header.type6 {
461		background: transparent;
462		position: absolute;
463		top: 0;
464		left: 0;
465		width: 100%;
466		z-index: 1;
467		}
468		}
469		.banner-content-18 {
470		padding: 290px 0 80px;
471		}
472		@media(max-width:767px){
473		.owl-middle-outer-narrow .owl-theme .owl-controls {
474		display:none !important;
475		}
476		}
477		.block-category-list {
478		margin-bottom: 15px;
479		}
480		.products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {
481		border-radius: 0 0 5px 5px;
482		font-family: "Open Sans";
483		letter-spacing: 0;
484		}
485		.price-box .price {
486		font-family: "Open Sans";
487		font-weight: 600;
488		}]]>
489		</custom_style>
490
491		<custom_style_2>
492		<![CDATA[]]>
493		</custom_style_2>
494
495		</custom_settings>
496
497		</porto_settings>
498
499		<porto_design>
500
501		<general>
502
503		<theme_color>
504		EA6A4A
505		</theme_color>
506
507		</general>
508
509		<font>
510
511		<custom>
512		0
513		</custom>
514
515		<font_size>
516		</font_size>
517
518		<font_family>
519		</font_family>
520
521		<custom_font_family>
522		</custom_font_family>
523
524		<google_font_family>
525		</google_font_family>
526
527		<char_latin_ext>
528		</char_latin_ext>
529
530		<char_subset>
531		</char_subset>
532
533		</font>
534
535		<colors>
536
537		<custom>
538		0
539		</custom>
540
541		<text_color>
542		</text_color>
543
544		<link_color>
545		</link_color>
546
547		<link_hover_color>
548		</link_hover_color>
549
550		<button_bg_color>
551		</button_bg_color>
552
553		<button_text_color>
554		</button_text_color>
555
556		<button_hover_bg_color>
557		</button_hover_bg_color>
558
559		<button_hover_text_color>
560		</button_hover_text_color>
561
562		<addtowishlist_color>
563		</addtowishlist_color>
564
565		<addtowishlist_hover_color>
566		</addtowishlist_hover_color>
567
568		<addtocompare_color>
569		</addtocompare_color>
570
571		<addtocompare_hover_color>
572		</addtocompare_hover_color>
573
574		<breadcrumbs_bg_color>
575		</breadcrumbs_bg_color>
576
577		<breadcrumbs_color>
578		</breadcrumbs_color>
579
580		<breadcrumbs_links_color>
581		</breadcrumbs_links_color>
582
583		<breadcrumbs_links_hover_color>
584		</breadcrumbs_links_hover_color>
585
586		<sale_bg_color>
587		</sale_bg_color>
588
589		<sale_font_color>
590		</sale_font_color>
591
592		<new_bg_color>
593		</new_bg_color>
594
595		<new_font_color>
596		</new_font_color>
597
598		</colors>
599
600		<header>
601
602		<custom>
603		1
604		</custom>
605
606		<header_bgcolor>
607		</header_bgcolor>
608
609		<header_bg_image>
610		</header_bg_image>
611
612		<header_bordercolor>
613		</header_bordercolor>
614
615		<header_textcolor>
616		</header_textcolor>
617
618		<header_linkcolor>
619		</header_linkcolor>
620
621		<header_top_links_bgcolor>
622		3D3734
623		</header_top_links_bgcolor>
624
625		<header_top_links_color>
626		FFFFFF
627		</header_top_links_color>
628
629		<header_menu_bgcolor>
630		</header_menu_bgcolor>
631
632		<header_menu_color>
633		</header_menu_color>
634
635		<header_menu_hover_bgcolor>
636		</header_menu_hover_bgcolor>
637
638		<header_menu_hover_color>
639		</header_menu_hover_color>
640
641		<header_menu_classicmenu_bgcolor>
642		</header_menu_classicmenu_bgcolor>
643
644		<header_menu_classicmenu_bordercolor>
645		</header_menu_classicmenu_bordercolor>
646
647		<header_menu_classicmenu_color>
648		</header_menu_classicmenu_color>
649
650		<header_menu_classicmenu_hover_bgcolor>
651		</header_menu_classicmenu_hover_bgcolor>
652
653		<header_menu_classicmenu_hover_color>
654		</header_menu_classicmenu_hover_color>
655
656		<header_search_bgcolor>
657		</header_search_bgcolor>
658
659		<header_search_text_color>
660		</header_search_text_color>
661
662		<header_search_bordercolor>
663		</header_search_bordercolor>
664
665		<header_minicart_bgcolor>
666		</header_minicart_bgcolor>
667
668		<header_minicart_color>
669		</header_minicart_color>
670
671		<header_minicart_icon_color>
672		</header_minicart_icon_color>
673
674		</header>
675
676		<footer>
677
678		<custom>
679		1
680		</custom>
681
682		<footer_top_bgcolor>
683		</footer_top_bgcolor>
684
685		<footer_top_color>
686		</footer_top_color>
687
688		<footer_top_link_color>
689		</footer_top_link_color>
690
691		<footer_top_link_hover_color>
692		</footer_top_link_hover_color>
693
694		<footer_middle_bgcolor>
695		FBFBFB
696		</footer_middle_bgcolor>
697
698		<footer_middle_color>
699		777777
700		</footer_middle_color>
701
702		<footer_middle_link_color>
703		777777
704		</footer_middle_link_color>
705
706		<footer_middle_link_hover_color>
707		777777
708		</footer_middle_link_hover_color>
709
710		<footer_middle_title_color>
711		000000
712		</footer_middle_title_color>
713
714		<footer_middle_links_icon_color>
715		777777
716		</footer_middle_links_icon_color>
717
718		<footer_middle_ribbon_bgcolor>
719		</footer_middle_ribbon_bgcolor>
720
721		<footer_middle_ribbon_shadow_color>
722		</footer_middle_ribbon_shadow_color>
723
724		<footer_middle_ribbon_color>
725		</footer_middle_ribbon_color>
726
727		<footer_middle_2_bgcolor>
728		</footer_middle_2_bgcolor>
729
730		<footer_middle_2_color>
731		</footer_middle_2_color>
732
733		<footer_middle_2_link_color>
734		</footer_middle_2_link_color>
735
736		<footer_middle_2_link_hover_color>
737		</footer_middle_2_link_hover_color>
738
739		<footer_middle_2_title_color>
740		</footer_middle_2_title_color>
741
742		<footer_middle_2_links_icon_color>
743		</footer_middle_2_links_icon_color>
744
745		<footer_bottom_bgcolor>
746		F1F1F1
747		</footer_bottom_bgcolor>
748
749		<footer_bottom_color>
750		777777
751		</footer_bottom_color>
752
753		<footer_bottom_link_color>
754		777777
755		</footer_bottom_link_color>
756
757		<footer_bottom_link_hover_color>
758		777777
759		</footer_bottom_link_hover_color>
760
761		</footer>
762
763		<page>
764
765		<custom>
766		1
767		</custom>
768
769		<page_bgcolor>
770		</page_bgcolor>
771
772		<page_bg_image>
773		</page_bg_image>
774
775		<page_custom_style>
776		<![CDATA[]]>
777		</page_custom_style>
778
779		</page>
780
781		<main>
782
783		<custom>
784		0
785		</custom>
786
787		<main_bgcolor>
788		F1F1F1
789		</main_bgcolor>
790
791		<main_bg_image>
792		</main_bg_image>
793
794		<main_custom_style>
795		<![CDATA[]]>
796		</main_custom_style>
797
798		</main>
799
800		</porto_design>
801
802		<mpsearch>
803
804		<general>
805
806		<enabled>
807		1
808		</enabled>
809
810		</general>
811
812		</mpsearch>
813		</config>
814		</root>