115. Araxis Merge File Comparison Report

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

115.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	demo10_old.xml	2019-12-13 09:06:04 +0000
2			2021-05-13 09:08:48 +0000

115.2 Comparison summary

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

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

115.4 Active regular expressions

No regular expressions were active.

115.5 Comparison detail

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