109. Araxis Merge File Comparison Report

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

109.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	demo07_old.xml	2019-12-13 09:05:32 +0000
2			2021-05-13 09:08:47 +0000

109.2 Comparison summary

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

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

109.4 Active regular expressions

No regular expressions were active.

109.5 Comparison detail

1		<root>
2		<config>
3
4		<web>
5
6		<default>
7
8		<cms_home_page>
9		porto_home_7_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_charcoal.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		6
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		1
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.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		3
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_charcoal.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[.page-header {
437		border-top: 5px solid #56738e;
438		}
439		.block-category-list {
440		margin-bottom: 15px;
441		}
442		.products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {
443		border-radius: 0 0 5px 5px;
444		font-family: "Open Sans";
445		letter-spacing: 0;
446		}
447		.price-box .price {
448		font-family: "Open Sans";
449		font-weight: 600;
450		}]]>
451		</custom_style>
452
453		<custom_style_2>
454		<![CDATA[]]>
455		</custom_style_2>
456
457		</custom_settings>
458
459		</porto_settings>
460
461		<porto_design>
462
463		<general>
464
465		<theme_color>
466		65829D
467		</theme_color>
468
469		</general>
470
471		<font>
472
473		<custom>
474		0
475		</custom>
476
477		<font_size>
478		</font_size>
479
480		<font_family>
481		</font_family>
482
483		<custom_font_family>
484		</custom_font_family>
485
486		<google_font_family>
487		</google_font_family>
488
489		<char_latin_ext>
490		</char_latin_ext>
491
492		<char_subset>
493		</char_subset>
494
495		</font>
496
497		<colors>
498
499		<custom>
500		0
501		</custom>
502
503		<text_color>
504		</text_color>
505
506		<link_color>
507		</link_color>
508
509		<link_hover_color>
510		</link_hover_color>
511
512		<button_bg_color>
513		</button_bg_color>
514
515		<button_text_color>
516		</button_text_color>
517
518		<button_hover_bg_color>
519		</button_hover_bg_color>
520
521		<button_hover_text_color>
522		</button_hover_text_color>
523
524		<addtowishlist_color>
525		</addtowishlist_color>
526
527		<addtowishlist_hover_color>
528		</addtowishlist_hover_color>
529
530		<addtocompare_color>
531		</addtocompare_color>
532
533		<addtocompare_hover_color>
534		</addtocompare_hover_color>
535
536		<breadcrumbs_bg_color>
537		</breadcrumbs_bg_color>
538
539		<breadcrumbs_color>
540		</breadcrumbs_color>
541
542		<breadcrumbs_links_color>
543		</breadcrumbs_links_color>
544
545		<breadcrumbs_links_hover_color>
546		</breadcrumbs_links_hover_color>
547
548		<sale_bg_color>
549		</sale_bg_color>
550
551		<sale_font_color>
552		</sale_font_color>
553
554		<new_bg_color>
555		</new_bg_color>
556
557		<new_font_color>
558		</new_font_color>
559
560		</colors>
561
562		<header>
563
564		<custom>
565		0
566		</custom>
567
568		<header_bgcolor>
569		</header_bgcolor>
570
571		<header_bg_image>
572		</header_bg_image>
573
574		<header_bordercolor>
575		</header_bordercolor>
576
577		<header_textcolor>
578		</header_textcolor>
579
580		<header_linkcolor>
581		</header_linkcolor>
582
583		<header_top_links_bgcolor>
584		</header_top_links_bgcolor>
585
586		<header_top_links_color>
587		</header_top_links_color>
588
589		<header_menu_bgcolor>
590		</header_menu_bgcolor>
591
592		<header_menu_color>
593		</header_menu_color>
594
595		<header_menu_hover_bgcolor>
596		</header_menu_hover_bgcolor>
597
598		<header_menu_hover_color>
599		</header_menu_hover_color>
600
601		<header_menu_classicmenu_bgcolor>
602		</header_menu_classicmenu_bgcolor>
603
604		<header_menu_classicmenu_bordercolor>
605		</header_menu_classicmenu_bordercolor>
606
607		<header_menu_classicmenu_color>
608		</header_menu_classicmenu_color>
609
610		<header_menu_classicmenu_hover_bgcolor>
611		</header_menu_classicmenu_hover_bgcolor>
612
613		<header_menu_classicmenu_hover_color>
614		</header_menu_classicmenu_hover_color>
615
616		<header_search_bgcolor>
617		</header_search_bgcolor>
618
619		<header_search_text_color>
620		</header_search_text_color>
621
622		<header_search_bordercolor>
623		</header_search_bordercolor>
624
625		<header_minicart_bgcolor>
626		</header_minicart_bgcolor>
627
628		<header_minicart_color>
629		</header_minicart_color>
630
631		<header_minicart_icon_color>
632		</header_minicart_icon_color>
633
634		</header>
635
636		<footer>
637
638		<custom>
639		1
640		</custom>
641
642		<footer_top_bgcolor>
643		</footer_top_bgcolor>
644
645		<footer_top_color>
646		</footer_top_color>
647
648		<footer_top_link_color>
649		</footer_top_link_color>
650
651		<footer_top_link_hover_color>
652		</footer_top_link_hover_color>
653
654		<footer_middle_bgcolor>
655		</footer_middle_bgcolor>
656
657		<footer_middle_color>
658		</footer_middle_color>
659
660		<footer_middle_link_color>
661		</footer_middle_link_color>
662
663		<footer_middle_link_hover_color>
664		</footer_middle_link_hover_color>
665
666		<footer_middle_title_color>
667		</footer_middle_title_color>
668
669		<footer_middle_links_icon_color>
670		</footer_middle_links_icon_color>
671
672		<footer_middle_ribbon_bgcolor>
673		</footer_middle_ribbon_bgcolor>
674
675		<footer_middle_ribbon_shadow_color>
676		56738E
677		</footer_middle_ribbon_shadow_color>
678
679		<footer_middle_ribbon_color>
680		</footer_middle_ribbon_color>
681
682		<footer_middle_2_bgcolor>
683		</footer_middle_2_bgcolor>
684
685		<footer_middle_2_color>
686		</footer_middle_2_color>
687
688		<footer_middle_2_link_color>
689		</footer_middle_2_link_color>
690
691		<footer_middle_2_link_hover_color>
692		</footer_middle_2_link_hover_color>
693
694		<footer_middle_2_title_color>
695		</footer_middle_2_title_color>
696
697		<footer_middle_2_links_icon_color>
698		</footer_middle_2_links_icon_color>
699
700		<footer_bottom_bgcolor>
701		</footer_bottom_bgcolor>
702
703		<footer_bottom_color>
704		</footer_bottom_color>
705
706		<footer_bottom_link_color>
707		</footer_bottom_link_color>
708
709		<footer_bottom_link_hover_color>
710		</footer_bottom_link_hover_color>
711
712		</footer>
713
714		<page>
715
716		<custom>
717		0
718		</custom>
719
720		<page_bgcolor>
721		</page_bgcolor>
722
723		<page_bg_image>
724		</page_bg_image>
725
726		<page_custom_style>
727		<![CDATA[]]>
728		</page_custom_style>
729
730		</page>
731
732		<main>
733
734		<custom>
735		0
736		</custom>
737
738		<main_bgcolor>
739		</main_bgcolor>
740
741		<main_bg_image>
742		</main_bg_image>
743
744		<main_custom_style>
745		<![CDATA[]]>
746		</main_custom_style>
747
748		</main>
749
750		</porto_design>
751
752		<mpsearch>
753
754		<general>
755
756		<enabled>
757		0
758		</enabled>
759
760		</general>
761
762		</mpsearch>
763		</config>
764		</root>