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

133.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	demo19_old.xml	2019-12-13 09:07:42 +0000
2			2021-05-13 09:08:51 +0000

133.2 Comparison summary

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

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

133.4 Active regular expressions

No regular expressions were active.

133.5 Comparison detail

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