99. Araxis Merge File Comparison Report

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

99.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/importdemo02_old.xml2019-12-13 09:04:26 +0000
22021-05-13 09:08:45 +0000

99.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted00
Removed1771

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

99.4 Active regular expressions

No regular expressions were active.

99.5 Comparison detail

1 <root>    
2  <config>    
3           
4   <web>    
5                
6    <default>    
7                     
8     <cms_home_page>    
9      porto_home_2_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_white.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      0    
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      9    
88     </header_type>    
89                     
90     <static_block>    
91      porto_custom_block_for_header    
92     </static_block>    
93                     
94     <sticky_header_logo>    
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     </footer_top_custom>    
111                     
112     <footer_middle>    
113      1    
114     </footer_middle>    
115                     
116     <footer_ribbon>    
117      0    
118     </footer_ribbon>    
119                     
120     <footer_ribbon_text>    
121      Ribbon Text    
122     </footer_ribbon_text>    
123                     
124     <footer_middle_column_1>    
125      custom    
126     </footer_middle_column_1>    
127                     
128     <footer_middle_column_1_custom>    
129      porto_footer_links    
130     </footer_middle_column_1_custom>    
131                     
132     <footer_middle_column_1_size>    
133      3    
134     </footer_middle_column_1_size>    
135                     
136     <footer_middle_column_2>    
137      custom    
138     </footer_middle_column_2>    
139                     
140     <footer_middle_column_2_custom>    
141      porto_footer_contact_information    
142     </footer_middle_column_2_custom>    
143                     
144     <footer_middle_column_2_size>    
145      3    
146     </footer_middle_column_2_size>    
147                     
148     <footer_middle_column_3>    
149      custom    
150     </footer_middle_column_3>    
151                     
152     <footer_middle_column_3_custom>    
153      porto_footer_features    
154     </footer_middle_column_3_custom>    
155                     
156     <footer_middle_column_3_size>    
157      3    
158     </footer_middle_column_3_size>    
159                     
160     <footer_middle_column_4>    
161      newsletter    
162     </footer_middle_column_4>    
163                     
164     <footer_middle_column_4_custom>    
165      porto_footer_links    
166     </footer_middle_column_4_custom>    
167                     
168     <footer_middle_column_4_size>    
169      3    
170     </footer_middle_column_4_size>    
171                     
172     <footer_middle_2>    
173      0    
174     </footer_middle_2>    
175                     
176     <footer_middle_2_column_1>    
177      custom    
178     </footer_middle_2_column_1>    
179                     
180     <footer_middle_2_column_1_custom>    
181      porto_footer_links    
182     </footer_middle_2_column_1_custom>    
183                     
184     <footer_middle_2_column_1_size>    
185      3    
186     </footer_middle_2_column_1_size>    
187                     
188     <footer_middle_2_column_2>    
189      custom    
190     </footer_middle_2_column_2>    
191                     
192     <footer_middle_2_column_2_custom>    
193      porto_footer_links    
194     </footer_middle_2_column_2_custom>    
195                     
196     <footer_middle_2_column_2_size>    
197      3    
198     </footer_middle_2_column_2_size>    
199                     
200     <footer_middle_2_column_3>    
201      custom    
202     </footer_middle_2_column_3>    
203                     
204     <footer_middle_2_column_3_custom>    
205      porto_footer_links    
206     </footer_middle_2_column_3_custom>    
207                     
208     <footer_middle_2_column_3_size>    
209      3    
210     </footer_middle_2_column_3_size>    
211                     
212     <footer_middle_2_column_4>    
213      custom    
214     </footer_middle_2_column_4>    
215                     
216     <footer_middle_2_column_4_custom>    
217      porto_footer_links    
218     </footer_middle_2_column_4_custom>    
219                     
220     <footer_middle_2_column_4_size>    
221      3    
222     </footer_middle_2_column_4_size>    
223                     
224     <footer_bottom>    
225      1    
226     </footer_bottom>    
227                     
228     <footer_store_switcher>    
229      0    
230     </footer_store_switcher>    
231                     
232     <footer_logo_src>    
233      default/logo_footer_black.png    
234     </footer_logo_src>    
235                     
236     <footer_bottom_copyrights>    
237      <![CDATA[&copy;Copyright 2020 by PORTO. All Rights Reserved.]]>    
238     </footer_bottom_copyrights>    
239                     
240     <footer_bottom_custom_1>    
241      porto_footer_bottom_custom_block    
242     </footer_bottom_custom_1>    
243                     
244     <footer_bottom_custom_2>    
245     </footer_bottom_custom_2>    
246                 
247    </footer>    
248                
249    <category>    
250                     
251     <alternative_image>    
252      1    
253     </alternative_image>    
254                     
255     <aspect_ratio>    
256      0    
257     </aspect_ratio>    
258                     
259     <ratio_width>    
260      300    
261     </ratio_width>    
262                     
263     <ratio_height>    
264      400    
265     </ratio_height>    
266                     
267     <rating_star>    
268      1    
269     </rating_star>    
270                     
271     <product_price>    
272      1    
273     </product_price>    
274                     
275     <actions>    
276      1    
277     </actions>    
278                     
279     <addtocompare>    
280      1    
281     </addtocompare>    
282                     
283     <addtowishlist>    
284      1    
285     </addtowishlist>    
286                     
287     <page_layout>    
288      2columns-left    
289     </page_layout>    
290                     
291     <category_description>    
292      main_column    
293     </category_description>    
294                     
295     <side_custom_block>    
296      porto_category_side_custom_block    
297     </side_custom_block>    
298                 
299    </category>    
300                
301    <category_grid>    
302                     
303     <product_type>    
304      4    
305     </product_type>    
306                     
307     <columns>    
308      4    
309     </columns>    
310                 
311    </category_grid>    
312                
313    <product>    
314                     
315     <product_image_size>    
316      6    
317     </product_image_size>    
318                     
319     <side_custom_block>    
320      porto_product_side_custom_block    
321     </side_custom_block>    
322                     
323     <main_custom_block>    
324     </main_custom_block>    
325                     
326     <main_custom_block2>    
327     </main_custom_block2>    
328                     
329     <move_addtolinks>    
330      0    
331     </move_addtolinks>    
332                     
333     <move_upsell_full>    
334      0    
335     </move_upsell_full>    
336                     
337     <page_layout>    
338      2columns-right    
339     </page_layout>    
340                     
341     <tab_full_background>    
342      0    
343     </tab_full_background>    
344                     
345     <custom_block_next_tab>    
346     </custom_block_next_tab>    
347                     
348     <upsell_columns>    
349      4    
350     </upsell_columns>    
351                     
352     <move_upsell>    
353      0    
354     </move_upsell>    
355                 
356    </product>    
357    »       »           
358    <newsletter>    
359     »       »       »           
360     <logo_src>    
361      default/logo_black.png    
362     </logo_src>    
363     »       »           
364    </newsletter>    
365                
366    <contacts>    
367                     
368     <enable>    
369      1    
370     </enable>    
371                     
372     <full_width>    
373      0    
374     </full_width>    
375                     
376     <address>    
377      Porto2 Store    
378     </address>    
379                     
380     <latitude>    
381      -34.398    
382     </latitude>    
383                     
384     <longitude>    
385      150.884    
386     </longitude>    
387                     
388     <zoom>    
389      18    
390     </zoom>    
391                     
392     <infoblock>    
393      <![CDATA[<div class="row">    
394      <div class="col-md-12">    
395          <i class="porto-icon-phone"></i>    
396          <p>0201 203 2032</p>    
397          <p>0201 203 2032</p>    
398      </div>    
399      </div>    
400      <div class="row">    
401      <div class="col-md-12">    
402          <i class="porto-icon-mobile"></i>    
403          <p>201-123-3922</p>    
404          <p>302-123-3928</p>    
405      </div>    
406      </div>    
407      <div class="row">    
408      <div class="col-md-12">    
409          <i class="porto-icon-mail-alt"></i>    
410          <p>porto@gmail.com</p>    
411          <p>porto@portotemplate.com</p>    
412      </div>    
413      </div>    
414      <div class="row">    
415      <div class="col-md-12">    
416          <i class="porto-icon-skype"></i>    
417          <p>porto_skype</p>    
418          <p>proto_template</p>    
419      </div>    
420      </div>]]>    
421     </infoblock>    
422                     
423     <customblock>    
424     </customblock>    
425                 
426    </contacts>    
427                
428    <custom_settings>    
429                     
430     <custom_style>    
431      <![CDATA[.footer-middle .block .block-title strong {    
432          font-weight: 700;    
433          text-transform: uppercase;    
434      }    
435      .product-item-photo {    
436          border-radius: 0;    
437          border: 0;    
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;    
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      3F4658    
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      F5F5F5    
656     </footer_middle_bgcolor>    
657                     
658     <footer_middle_color>    
659      777777    
660     </footer_middle_color>    
661                     
662     <footer_middle_link_color>    
663      777777    
664     </footer_middle_link_color>    
665                     
666     <footer_middle_link_hover_color>    
667      777777    
668     </footer_middle_link_hover_color>    
669                     
670     <footer_middle_title_color>    
671      000000    
672     </footer_middle_title_color>    
673                     
674     <footer_middle_links_icon_color>    
675      777777    
676     </footer_middle_links_icon_color>    
677                     
678     <footer_middle_ribbon_bgcolor>    
679     </footer_middle_ribbon_bgcolor>    
680                     
681     <footer_middle_ribbon_shadow_color>    
682      282D3A    
683     </footer_middle_ribbon_shadow_color>    
684                     
685     <footer_middle_ribbon_color>    
686     </footer_middle_ribbon_color>    
687                     
688     <footer_middle_2_bgcolor>    
689     </footer_middle_2_bgcolor>    
690                     
691     <footer_middle_2_color>    
692     </footer_middle_2_color>    
693                     
694     <footer_middle_2_link_color>    
695     </footer_middle_2_link_color>    
696                     
697     <footer_middle_2_link_hover_color>    
698     </footer_middle_2_link_hover_color>    
699                     
700     <footer_middle_2_title_color>    
701     </footer_middle_2_title_color>    
702                     
703     <footer_middle_2_links_icon_color>    
704     </footer_middle_2_links_icon_color>    
705                     
706     <footer_bottom_bgcolor>    
707      FFFFFF    
708     </footer_bottom_bgcolor>    
709                     
710     <footer_bottom_color>    
711     </footer_bottom_color>    
712                     
713     <footer_bottom_link_color>    
714     </footer_bottom_link_color>    
715                     
716     <footer_bottom_link_hover_color>    
717     </footer_bottom_link_hover_color>    
718                 
719    </footer>    
720                
721    <page>    
722                     
723     <custom>    
724      0    
725     </custom>    
726                     
727     <page_bgcolor>    
728     </page_bgcolor>    
729                     
730     <page_bg_image>    
731     </page_bg_image>    
732                     
733     <page_custom_style>    
734      <![CDATA[]]>    
735     </page_custom_style>    
736                 
737    </page>    
738                
739    <main>    
740                     
741     <custom>    
742      0    
743     </custom>    
744                     
745     <main_bgcolor>    
746     </main_bgcolor>    
747                     
748     <main_bg_image>    
749     </main_bg_image>    
750                     
751     <main_custom_style>    
752      <![CDATA[]]>    
753     </main_custom_style>    
754                 
755    </main>    
756            
757   </porto_design>    
758           
759   <mpsearch>    
760                
761    <general>    
762                     
763     <enabled>    
764      0    
765     </enabled>    
766                 
767    </general>    
768            
769   </mpsearch>    
770  </config>    
771 </root>