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

123.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/importdemo14_old.xml2019-12-13 09:06:50 +0000
22021-05-13 09:08:49 +0000

123.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted00
Removed1861

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

123.4 Active regular expressions

No regular expressions were active.

123.5 Comparison detail

1 <root>    
2  <config>    
3           
4   <web>    
5                
6    <default>    
7                     
8     <cms_home_page>    
9      porto_home_14_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      1280    
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      1    
88     </header_type>    
89                     
90     <static_block>    
91      porto_custom_block_for_header    
92     </static_block>    
93                     
94     <sticky_header_logo>    
95      default/logo_white_plus.png    
96     </sticky_header_logo>    
97                 
98    </header>    
99                
100    <footer>    
101                     
102     <footer_top>    
103      0    
104     </footer_top>    
105                     
106     <footer_top_block>    
107      custom    
108     </footer_top_block>    
109                     
110     <footer_top_custom>    
111      porto_footer_top_custom_block    
112     </footer_top_custom>    
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_about_porto    
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_featured_products    
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      newsletter    
152     </footer_middle_column_3>    
153                     
154     <footer_middle_column_3_custom>    
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      custom    
163     </footer_middle_column_4>    
164                     
165     <footer_middle_column_4_custom>    
166      porto_footer_middle_twitter_widget    
167     </footer_middle_column_4_custom>    
168                     
169     <footer_middle_column_4_size>    
170      4    
171     </footer_middle_column_4_size>    
172                     
173     <footer_middle_2>    
174      1    
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_2nd_row_shop    
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_2nd_row_popular_tags    
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_2nd_row_myaccount    
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_2nd_row_contact_information    
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.png    
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_home14    
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      1    
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[@media (min-width:768px){    
433          .footer-middle .col-md-3 {    
434              width: 22.22%;    
435          }    
436          .navigation > ul {    
437              border-bottom: 4px solid #3f4048;    
438              height: 54px;    
439          }    
440          .page-header.type1 .navigation li.level0 > .level-top {    
441              line-height: 50px;    
442          }    
443          .page-header.type1 .navigation li.level0.parent > a:after {    
444              line-height: 50px;    
445          }    
446      }    
447      .page-header.type1 {    
448          border: 0;    
449      }    
450      .footer-middle .block .block-title strong {    
451          text-transform: uppercase;    
452      }    
453      .footer-middle .block.newsletter input {    
454          background-color: #45464e;    
455          border-radius: 0;    
456          height: 36px;    
457          color: #fff;    
458      }    
459      .footer-middle .block.newsletter .action.subscribe {    
460          background-color: #0f0f0f;    
461          color: #fff;    
462          height: 36px;    
463          line-height: 36px;    
464          border-radius: 0;    
465          text-transform: uppercase;    
466      }    
467      .footer .product.name a {    
468          color: #fff;    
469          font-size: 12px;    
470      }    
471      .footer .product-item .product-reviews-summary {    
472          background: none;    
473          margin: 0;    
474      }    
475      .footer .product-item .rating-summary .rating-result > span:before {    
476          color: #fff;    
477      }    
478      .footer .price-container .price {    
479          color: #fff;    
480          font-size: 15px;    
481      }    
482      @media (min-width: 768px) {    
483          header.page-header.type1.sticky-header .nav-sections {    
484              background-color: #54555E;    
485          }    
486          header.page-header.type1.sticky-header .navigation > ul {    
487              border: 0;    
488              height: auto;    
489          }    
490          header.page-header.type1.sticky-header .minicart-wrapper .action.showcart:before {    
491              color: #fff;    
492          }    
493      }    
494      @media (min-width: 1200px) {    
495      »       header.page-header.sticky-header.type1 .nav-sections {    
496      »       »       background-color: #54555E;    
497      »       }    
498          header.page-header.type1.sticky-header .navigation > ul {    
499              border: 0;    
500              height: auto;    
501          }    
502      »       header.page-header.sticky-header.type1 .minicart-wrapper .action.showcart .counter.qty {    
503      »       »       color: #000;    
504      »       }    
505      »       header.page-header.sticky-header.type1 .minicart-wrapper .action.showcart:before {    
506      »       »       color: #fff;    
507      »       }    
508      }    
509      .block-category-list {    
510          margin-bottom: 15px;    
511      }    
512      .products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {    
513          border-radius: 0 0 5px 5px;    
514          font-family: "Open Sans";    
515          letter-spacing: 0;    
516      }    
517      .price-box .price {    
518          font-family: "Open Sans";    
519          font-weight: 600;    
520      }]]>    
521     </custom_style>    
522                     
523     <custom_style_2>    
524      <![CDATA[]]>    
525     </custom_style_2>    
526                 
527    </custom_settings>    
528            
529   </porto_settings>    
530           
531   <porto_design>    
532                
533    <general>    
534                     
535     <theme_color>    
536      000000    
537     </theme_color>    
538                 
539    </general>    
540                
541    <font>    
542                     
543     <custom>    
544      0    
545     </custom>    
546                     
547     <font_size>    
548     </font_size>    
549                     
550     <font_family>    
551     </font_family>    
552                     
553     <custom_font_family>    
554     </custom_font_family>    
555                     
556     <google_font_family>    
557     </google_font_family>    
558                     
559     <char_latin_ext>    
560     </char_latin_ext>    
561                     
562     <char_subset>    
563     </char_subset>    
564                 
565    </font>    
566                
567    <colors>    
568                     
569     <custom>    
570      1    
571     </custom>    
572                     
573     <text_color>    
574     </text_color>    
575                     
576     <link_color>    
577     </link_color>    
578                     
579     <link_hover_color>    
580     </link_hover_color>    
581                     
582     <button_bg_color>    
583     </button_bg_color>    
584                     
585     <button_text_color>    
586     </button_text_color>    
587                     
588     <button_hover_bg_color>    
589     </button_hover_bg_color>    
590                     
591     <button_hover_text_color>    
592     </button_hover_text_color>    
593                     
594     <addtowishlist_color>    
595     </addtowishlist_color>    
596                     
597     <addtowishlist_hover_color>    
598     </addtowishlist_hover_color>    
599                     
600     <addtocompare_color>    
601     </addtocompare_color>    
602                     
603     <addtocompare_hover_color>    
604     </addtocompare_hover_color>    
605                     
606     <breadcrumbs_bg_color>    
607      transparent    
608     </breadcrumbs_bg_color>    
609                     
610     <breadcrumbs_color>    
611      777777    
612     </breadcrumbs_color>    
613                     
614     <breadcrumbs_links_color>    
615      000000    
616     </breadcrumbs_links_color>    
617                     
618     <breadcrumbs_links_hover_color>    
619      000000    
620     </breadcrumbs_links_hover_color>    
621                     
622     <sale_bg_color>    
623     </sale_bg_color>    
624                     
625     <sale_font_color>    
626     </sale_font_color>    
627                     
628     <new_bg_color>    
629     </new_bg_color>    
630                     
631     <new_font_color>    
632     </new_font_color>    
633                 
634    </colors>    
635                
636    <header>    
637                     
638     <custom>    
639      1    
640     </custom>    
641                     
642     <header_bgcolor>    
643      transparent    
644     </header_bgcolor>    
645                     
646     <header_bg_image>    
647     </header_bg_image>    
648                     
649     <header_bordercolor>    
650     </header_bordercolor>    
651                     
652     <header_textcolor>    
653     </header_textcolor>    
654                     
655     <header_linkcolor>    
656     </header_linkcolor>    
657                     
658     <header_top_links_bgcolor>    
659      transparent    
660     </header_top_links_bgcolor>    
661                     
662     <header_top_links_color>    
663     </header_top_links_color>    
664                     
665     <header_menu_bgcolor>    
666      54555E    
667     </header_menu_bgcolor>    
668                     
669     <header_menu_color>    
670      FFFFFF    
671     </header_menu_color>    
672                     
673     <header_menu_hover_bgcolor>    
674      FFFFFF    
675     </header_menu_hover_bgcolor>    
676                     
677     <header_menu_hover_color>    
678      000000    
679     </header_menu_hover_color>    
680                     
681     <header_menu_classicmenu_bgcolor>    
682     </header_menu_classicmenu_bgcolor>    
683                     
684     <header_menu_classicmenu_bordercolor>    
685     </header_menu_classicmenu_bordercolor>    
686                     
687     <header_menu_classicmenu_color>    
688     </header_menu_classicmenu_color>    
689                     
690     <header_menu_classicmenu_hover_bgcolor>    
691     </header_menu_classicmenu_hover_bgcolor>    
692                     
693     <header_menu_classicmenu_hover_color>    
694     </header_menu_classicmenu_hover_color>    
695                     
696     <header_search_bgcolor>    
697     </header_search_bgcolor>    
698                     
699     <header_search_text_color>    
700     </header_search_text_color>    
701                     
702     <header_search_bordercolor>    
703     </header_search_bordercolor>    
704                     
705     <header_minicart_bgcolor>    
706     </header_minicart_bgcolor>    
707                     
708     <header_minicart_color>    
709     </header_minicart_color>    
710                     
711     <header_minicart_icon_color>    
712     </header_minicart_icon_color>    
713                 
714    </header>    
715                
716    <footer>    
717                     
718     <custom>    
719      1    
720     </custom>    
721                     
722     <footer_top_bgcolor>    
723     </footer_top_bgcolor>    
724                     
725     <footer_top_color>    
726     </footer_top_color>    
727                     
728     <footer_top_link_color>    
729     </footer_top_link_color>    
730                     
731     <footer_top_link_hover_color>    
732     </footer_top_link_hover_color>    
733                     
734     <footer_middle_bgcolor>    
735      54555E    
736     </footer_middle_bgcolor>    
737                     
738     <footer_middle_color>    
739      BBBBBB    
740     </footer_middle_color>    
741                     
742     <footer_middle_link_color>    
743      BBBBBB    
744     </footer_middle_link_color>    
745                     
746     <footer_middle_link_hover_color>    
747      BBBBBB    
748     </footer_middle_link_hover_color>    
749                     
750     <footer_middle_title_color>    
751      FFFFFF    
752     </footer_middle_title_color>    
753                     
754     <footer_middle_links_icon_color>    
755      BBBBBB    
756     </footer_middle_links_icon_color>    
757                     
758     <footer_middle_ribbon_bgcolor>    
759     </footer_middle_ribbon_bgcolor>    
760                     
761     <footer_middle_ribbon_shadow_color>    
762     </footer_middle_ribbon_shadow_color>    
763                     
764     <footer_middle_ribbon_color>    
765     </footer_middle_ribbon_color>    
766                     
767     <footer_middle_2_bgcolor>    
768      50515A    
769     </footer_middle_2_bgcolor>    
770                     
771     <footer_middle_2_color>    
772      BBBBBB    
773     </footer_middle_2_color>    
774                     
775     <footer_middle_2_link_color>    
776      BBBBBB    
777     </footer_middle_2_link_color>    
778                     
779     <footer_middle_2_link_hover_color>    
780      BBBBBB    
781     </footer_middle_2_link_hover_color>    
782                     
783     <footer_middle_2_title_color>    
784      FFFFFF    
785     </footer_middle_2_title_color>    
786                     
787     <footer_middle_2_links_icon_color>    
788      BBBBBB    
789     </footer_middle_2_links_icon_color>    
790                     
791     <footer_bottom_bgcolor>    
792      45464E    
793     </footer_bottom_bgcolor>    
794                     
795     <footer_bottom_color>    
796      BBBBBB    
797     </footer_bottom_color>    
798                     
799     <footer_bottom_link_color>    
800      BBBBBB    
801     </footer_bottom_link_color>    
802                     
803     <footer_bottom_link_hover_color>    
804      BBBBBB    
805     </footer_bottom_link_hover_color>    
806                 
807    </footer>    
808                
809    <page>    
810                     
811     <custom>    
812      1    
813     </custom>    
814                     
815     <page_bgcolor>    
816      FFFFFF    
817     </page_bgcolor>    
818                     
819     <page_bg_image>    
820      default/page.png    
821     </page_bg_image>    
822                     
823     <page_custom_style>    
824      <![CDATA[background-position:top center;background-repeat:repeat-x;]]>    
825     </page_custom_style>    
826                 
827    </page>    
828                
829    <main>    
830                     
831     <custom>    
832      0    
833     </custom>    
834                     
835     <main_bgcolor>    
836     </main_bgcolor>    
837                     
838     <main_bg_image>    
839     </main_bg_image>    
840                     
841     <main_custom_style>    
842      <![CDATA[]]>    
843     </main_custom_style>    
844                 
845    </main>    
846            
847   </porto_design>    
848           
849   <mpsearch>    
850                
851    <general>    
852                     
853     <enabled>    
854      1    
855     </enabled>    
856                 
857    </general>    
858            
859   </mpsearch>    
860  </config>    
861 </root>