119. Araxis Merge File Comparison Report

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

119.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/importdemo12_old.xml2019-12-13 09:06:22 +0000
22021-05-13 09:08:49 +0000

119.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted00
Removed1812

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

119.4 Active regular expressions

No regular expressions were active.

119.5 Comparison detail

1 <root>    
2  <config>    
3           
4   <web>    
5                
6    <default>    
7                     
8     <cms_home_page>    
9      porto_home_12_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_plus.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      8    
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      default/logo_black.png    
100     </sticky_header_logo>    
101                 
102    </header>    
103                
104    <footer>    
105                     
106     <footer_top>    
107      0    
108     </footer_top>    
109                     
110     <footer_top_block>    
111      custom    
112     </footer_top_block>    
113                     
114     <footer_middle>    
115      1    
116     </footer_middle>    
117                     
118     <footer_ribbon>    
119      0    
120     </footer_ribbon>    
121                     
122     <footer_ribbon_text>    
123      Ribbon Text    
124     </footer_ribbon_text>    
125                     
126     <footer_middle_column_1>    
127      custom    
128     </footer_middle_column_1>    
129                     
130     <footer_middle_column_1_custom>    
131      porto_footer_middle_logo_block_for_12    
132     </footer_middle_column_1_custom>    
133                     
134     <footer_middle_column_1_size>    
135      3    
136     </footer_middle_column_1_size>    
137                     
138     <footer_middle_column_2>    
139      custom    
140     </footer_middle_column_2>    
141                     
142     <footer_middle_column_2_custom>    
143      porto_footer_features    
144     </footer_middle_column_2_custom>    
145                     
146     <footer_middle_column_2_size>    
147      3    
148     </footer_middle_column_2_size>    
149                     
150     <footer_middle_column_3>    
151      custom    
152     </footer_middle_column_3>    
153                     
154     <footer_middle_column_3_custom>    
155      porto_footer_links    
156     </footer_middle_column_3_custom>    
157                     
158     <footer_middle_column_3_size>    
159      3    
160     </footer_middle_column_3_size>    
161                     
162     <footer_middle_column_4>    
163      custom    
164     </footer_middle_column_4>    
165                     
166     <footer_middle_column_4_custom>    
167      porto_footer_contact_information    
168     </footer_middle_column_4_custom>    
169                     
170     <footer_middle_column_4_size>    
171      3    
172     </footer_middle_column_4_size>    
173                     
174     <footer_middle_2>    
175      0    
176     </footer_middle_2>    
177                     
178     <footer_middle_2_column_1>    
179      custom    
180     </footer_middle_2_column_1>    
181                     
182     <footer_middle_2_column_1_custom>    
183      porto_footer_links    
184     </footer_middle_2_column_1_custom>    
185                     
186     <footer_middle_2_column_1_size>    
187      3    
188     </footer_middle_2_column_1_size>    
189                     
190     <footer_middle_2_column_2>    
191      custom    
192     </footer_middle_2_column_2>    
193                     
194     <footer_middle_2_column_2_custom>    
195      porto_footer_links    
196     </footer_middle_2_column_2_custom>    
197                     
198     <footer_middle_2_column_2_size>    
199      3    
200     </footer_middle_2_column_2_size>    
201                     
202     <footer_middle_2_column_3>    
203      custom    
204     </footer_middle_2_column_3>    
205                     
206     <footer_middle_2_column_3_custom>    
207      porto_footer_links    
208     </footer_middle_2_column_3_custom>    
209                     
210     <footer_middle_2_column_3_size>    
211      3    
212     </footer_middle_2_column_3_size>    
213                     
214     <footer_middle_2_column_4>    
215      custom    
216     </footer_middle_2_column_4>    
217                     
218     <footer_middle_2_column_4_custom>    
219      porto_footer_links    
220     </footer_middle_2_column_4_custom>    
221                     
222     <footer_middle_2_column_4_size>    
223      3    
224     </footer_middle_2_column_4_size>    
225                     
226     <footer_bottom>    
227      1    
228     </footer_bottom>    
229                     
230     <footer_store_switcher>    
231      0    
232     </footer_store_switcher>    
233                     
234     <footer_logo_src>    
235     </footer_logo_src>    
236                     
237     <footer_bottom_copyrights>    
238      <![CDATA[&copy;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      4    
306     </product_type>    
307                     
308     <columns>    
309      4    
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_black.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[.page-wrapper > .breadcrumbs .items {    
433          background-color: #fff;    
434          border-bottom: 1px solid #eee;    
435      }    
436      .page-footer {    
437          margin-top: 15px;    
438      }    
439      .footer-middle > .container {    
440          padding: 40px 15px;    
441          background-color: #fff;    
442      }    
443      .footer-middle {    
444          padding: 0;    
445      }    
446      .columns .column.main {    
447          padding: 0;    
448      }    
449      @media (min-width: 768px) {    
450          .sw-megamenu.navigation.side-megamenu li.level0 > a {    
451              text-transform: none;    
452          }    
453      }    
454      @media (min-width: 768px) and (max-width: 1199px) {    
455          .cms-index-index .page-header .drop-menu > a {    
456              pointer-events: all;    
457          }    
458          .sw-megamenu.navigation.side-megamenu li.level0.fullwidth > .submenu {    
459              width: 725px;    
460          }    
461          .cms-index-index .page-header .drop-menu .nav-sections {    
462              visibility: hidden;    
463          }    
464          .cms-index-index .page-header .drop-menu .nav-sections.visible {    
465              visibility: visible;    
466          }    
467      }    
468      @media(max-width:767px){    
469          .product-fullwidth {    
470              margin: 15px -15px 0 !important;    
471          }    
472      }    
473      .block-category-list {    
474          margin-bottom: 15px;    
475      }    
476      .products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {    
477          border-radius: 0 0 5px 5px;    
478          font-family: "Open Sans";    
479          letter-spacing: 0;    
480      }    
481      .price-box .price {    
482          font-family: "Open Sans";    
483          font-weight: 600;    
484      }]]>    
485     </custom_style>    
486                     
487     <custom_style_2>    
488      <![CDATA[]]>    
489     </custom_style_2>    
490                 
491    </custom_settings>    
492            
493   </porto_settings>    
494           
495   <porto_design>    
496                
497    <general>    
498                     
499     <theme_color>    
500      D0205E    
501     </theme_color>    
502                 
503    </general>    
504                
505    <font>    
506                     
507     <custom>    
508      0    
509     </custom>    
510                     
511     <font_size>    
512     </font_size>    
513                     
514     <font_family>    
515     </font_family>    
516                     
517     <custom_font_family>    
518     </custom_font_family>    
519                     
520     <google_font_family>    
521     </google_font_family>    
522                     
523     <char_latin_ext>    
524     </char_latin_ext>    
525                     
526     <char_subset>    
527     </char_subset>    
528                 
529    </font>    
530                
531    <colors>    
532                     
533     <custom>    
534      1    
535     </custom>    
536                     
537     <text_color>    
538     </text_color>    
539                     
540     <link_color>    
541     </link_color>    
542                     
543     <link_hover_color>    
544     </link_hover_color>    
545                     
546     <button_bg_color>    
547     </button_bg_color>    
548                     
549     <button_text_color>    
550     </button_text_color>    
551                     
552     <button_hover_bg_color>    
553     </button_hover_bg_color>    
554                     
555     <button_hover_text_color>    
556     </button_hover_text_color>    
557                     
558     <addtowishlist_color>    
559     </addtowishlist_color>    
560                     
561     <addtowishlist_hover_color>    
562     </addtowishlist_hover_color>    
563                     
564     <addtocompare_color>    
565     </addtocompare_color>    
566                     
567     <addtocompare_hover_color>    
568     </addtocompare_hover_color>    
569                     
570     <breadcrumbs_bg_color>    
571      transparent    
572     </breadcrumbs_bg_color>    
573                     
574     <breadcrumbs_color>    
575      777777    
576     </breadcrumbs_color>    
577                     
578     <breadcrumbs_links_color>    
579      777777    
580     </breadcrumbs_links_color>    
581                     
582     <breadcrumbs_links_hover_color>    
583      777777    
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      0    
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     </header_top_links_bgcolor>    
623                     
624     <header_top_links_color>    
625     </header_top_links_color>    
626                     
627     <header_menu_bgcolor>    
628     </header_menu_bgcolor>    
629                     
630     <header_menu_color>    
631     </header_menu_color>    
632                     
633     <header_menu_hover_bgcolor>    
634     </header_menu_hover_bgcolor>    
635                     
636     <header_menu_hover_color>    
637     </header_menu_hover_color>    
638                     
639     <header_menu_classicmenu_bgcolor>    
640     </header_menu_classicmenu_bgcolor>    
641                     
642     <header_menu_classicmenu_bordercolor>    
643     </header_menu_classicmenu_bordercolor>    
644                     
645     <header_menu_classicmenu_color>    
646     </header_menu_classicmenu_color>    
647                     
648     <header_menu_classicmenu_hover_bgcolor>    
649     </header_menu_classicmenu_hover_bgcolor>    
650                     
651     <header_menu_classicmenu_hover_color>    
652     </header_menu_classicmenu_hover_color>    
653                     
654     <header_search_bgcolor>    
655     </header_search_bgcolor>    
656                     
657     <header_search_text_color>    
658     </header_search_text_color>    
659                     
660     <header_search_bordercolor>    
661     </header_search_bordercolor>    
662                     
663     <header_minicart_bgcolor>    
664     </header_minicart_bgcolor>    
665                     
666     <header_minicart_color>    
667     </header_minicart_color>    
668                     
669     <header_minicart_icon_color>    
670     </header_minicart_icon_color>    
671                 
672    </header>    
673                
674    <footer>    
675                     
676     <custom>    
677      1    
678     </custom>    
679                     
680     <footer_top_bgcolor>    
681      transparent    
682     </footer_top_bgcolor>    
683                     
684     <footer_top_color>    
685     </footer_top_color>    
686                     
687     <footer_top_link_color>    
688     </footer_top_link_color>    
689                     
690     <footer_top_link_hover_color>    
691     </footer_top_link_hover_color>    
692                     
693     <footer_middle_bgcolor>    
694      transparent    
695     </footer_middle_bgcolor>    
696                     
697     <footer_middle_color>    
698      777777    
699     </footer_middle_color>    
700                     
701     <footer_middle_link_color>    
702      777777    
703     </footer_middle_link_color>    
704                     
705     <footer_middle_link_hover_color>    
706      777777    
707     </footer_middle_link_hover_color>    
708                     
709     <footer_middle_title_color>    
710      333333    
711     </footer_middle_title_color>    
712                     
713     <footer_middle_links_icon_color>    
714      D0205E    
715     </footer_middle_links_icon_color>    
716                     
717     <footer_middle_ribbon_bgcolor>    
718     </footer_middle_ribbon_bgcolor>    
719                     
720     <footer_middle_ribbon_shadow_color>    
721      92113E    
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      transparent    
747     </footer_bottom_bgcolor>    
748                     
749     <footer_bottom_color>    
750     </footer_bottom_color>    
751                     
752     <footer_bottom_link_color>    
753     </footer_bottom_link_color>    
754                     
755     <footer_bottom_link_hover_color>    
756     </footer_bottom_link_hover_color>    
757                 
758    </footer>    
759                
760    <page>    
761                     
762     <custom>    
763      1    
764     </custom>    
765                     
766     <page_bgcolor>    
767      F5F5F5    
768     </page_bgcolor>    
769                     
770     <page_bg_image>    
771     </page_bg_image>    
772                     
773     <page_custom_style>    
774      <![CDATA[]]>    
775     </page_custom_style>    
776                 
777    </page>    
778                
779    <main>    
780                     
781     <custom>    
782      1    
783     </custom>    
784                     
785     <main_bgcolor>    
786      FFFFFF    
787     </main_bgcolor>    
788                     
789     <main_bg_image>    
790     </main_bg_image>    
791                     
792     <main_custom_style>    
793      <![CDATA[]]>    
794     </main_custom_style>    
795                 
796    </main>    
797            
798   </porto_design>    
799           
800   <mpsearch>    
801                
802    <general>    
803                     
804     <enabled>    
805      1    
806     </enabled>    
807                 
808    </general>    
809            
810   </mpsearch>    
811  </config>    
812 </root>