merge demo design update (#191)

resources/zakra/zakra-chapel/dummy-data/dummy-widgets.wie

@@ -1 +1 @@
-{"sidebar-right":{"search-2":{"title":""},"recent-posts-2":{"title":"","number":5},"archives-3":{"title":"","count":0,"dropdown":0},"categories-3":{"title":"","count":0,"hierarchical":0,"dropdown":0},"meta-3":{"title":""}},"sidebar-left":{"archives-2":{"title":"","count":0,"dropdown":0},"categories-2":{"title":"","count":0,"hierarchical":0,"dropdown":0},"meta-2":{"title":""}},"footer-sidebar-1":{"custom_html-1":{"title":"About Us","content":"<div class=\"footer-logosec\">\n<img src=\"https:\/\/zakrademos.com\/church\/wp-content\/uploads\/sites\/78\/2020\/08\/footer-logo.png\">\n<p>Lorem ipsum dolor sit amet, conse\nctetur adipiscing elit. Integer at \nsemper arcu. Integer quis hendre \nnibh. Praesent at augue at tortor lorem ipsum dolor sit.<\/p>\n\n<\/div>\n"},"block-4":{"content":"<!-- wp:social-links {\"customIconBackgroundColor\":\"#ffcd00\",\"iconBackgroundColorValue\":\"#ffcd00\",\"size\":\"has-normal-icon-size\",\"style\":{\"spacing\":{\"blockGap\":{\"top\":\"8px\",\"left\":\"8px\"}}},\"className\":\"is-style-default\"} -->\n<ul class=\"wp-block-social-links has-normal-icon-size has-icon-background-color is-style-default\"><!-- wp:social-link {\"url\":\"https:\/\/www.facebook.com\/zakratheme\/\",\"service\":\"facebook\"} \/-->\n\n<!-- wp:social-link {\"url\":\"https:\/\/twitter.com\/zakratheme\/\",\"service\":\"twitter\"} \/-->\n\n<!-- wp:social-link {\"url\":\"https:\/\/plus.google.com\/zakratheme\/\",\"service\":\"google\"} \/-->\n\n<!-- wp:social-link {\"url\":\"https:\/\/www.linkedin.com\/zakratheme\/?_l=en_US\",\"service\":\"linkedin\"} \/--><\/ul>\n<!-- \/wp:social-links -->"}},"footer-sidebar-2":{"nav_menu-1":{"title":"Quick Links","nav_menu":21}},"footer-sidebar-3":{"nav_menu-3":{"title":"Recent Causes","nav_menu":27}},"footer-sidebar-4":{"recent-posts-3":{"title":"Latest News","number":3,"show_date":true}}}
+{"sidebar-right":{"search-2":{"title":""},"recent-posts-2":{"title":"","number":5},"archives-3":{"title":"","count":0,"dropdown":0},"categories-3":{"title":"","count":0,"hierarchical":0,"dropdown":0},"meta-3":{"title":""}},"sidebar-left":{"archives-2":{"title":"","count":0,"dropdown":0},"categories-2":{"title":"","count":0,"hierarchical":0,"dropdown":0},"meta-2":{"title":""}},"footer-sidebar-1":{"custom_html-3":{"title":"About Us","content":"<div>\n<p>Lorem ipsum dolor sit amet, conse\nctetur adipiscing elit. Integer at \nsemper arcu. Integer quis hendre \nnibh. Praesent at augue at tortor lorem ipsum dolor sit.<\/p>\n<\/div>\n"}},"footer-sidebar-2":{"nav_menu-1":{"title":"Quick Links","nav_menu":21}},"footer-sidebar-3":{"block-7":{"content":"<!-- wp:widget-group {\"title\":\"Contact Us\"} -->\n<h2 class=\"widget-title\">Contact Us<\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:group {\"style\":{\"spacing\":{\"padding\":{\"top\":\"0\",\"bottom\":\"0\"},\"margin\":{\"bottom\":\"0\"},\"blockGap\":\"0\"},\"dimensions\":{\"minHeight\":\"\"}},\"layout\":{\"type\":\"constrained\"}} -->\n<div class=\"wp-block-group\" style=\"margin-bottom:0;padding-top:0;padding-bottom:0\"><!-- wp:html -->\n(123) 977-666-888-999<br>\nUllamcorper 12 Street Roseville <br>\ninfo@flashchurch.com\n<!-- \/wp:html --><\/div>\n<!-- \/wp:group --><\/div>\n<!-- \/wp:widget-group -->"}},"footer-sidebar-4":{"recent-posts-3":{"title":"Latest News","number":4,"show_date":false}}}

resources/zakra/zakra-drone-02/dummy-data/dummy-data.xml

@@ -29,7 +29,7 @@
 	<title>Drone 02</title>
 	<link>https://zakrademos.com/drone-02</link>
 	<description></description>
-	<pubDate>Wed, 07 Aug 2024 12:41:21 +0000</pubDate>
+	<pubDate>Fri, 09 Aug 2024 08:27:13 +0000</pubDate>
 	<language>en-US</language>
 	<wp:wxr_version>1.2</wp:wxr_version>
 	<wp:base_site_url>https://zakrademos.com/</wp:base_site_url>

resources/zakra/zakra-gym-v2/dummy-data/dummy-widgets.wie

@@ -1 +1 @@
-{"sidebar-right":{"block-2":{"content":"<!-- wp:search \/-->"},"block-3":{"content":"<!-- wp:group --><div class=\"wp-block-group\"><!-- wp:heading --><h2>Recent Posts<\/h2><!-- \/wp:heading --><!-- wp:latest-posts \/--><\/div><!-- \/wp:group -->"},"block-4":{"content":"<!-- wp:group --><div class=\"wp-block-group\"><!-- wp:heading --><h2>Recent Comments<\/h2><!-- \/wp:heading --><!-- wp:latest-comments {\"displayAvatar\":false,\"displayDate\":false,\"displayExcerpt\":false} \/--><\/div><!-- \/wp:group -->"},"search-1":{"title":"Search"},"recent-posts-1":{"title":"Popular Posts","number":3,"show_date":true},"categories-2":{"title":"","count":0,"hierarchical":0,"dropdown":0},"recent-posts-2":{"title":"Popular Posts","number":3,"show_date":false}},"sidebar-left":{"block-5":{"content":"<!-- wp:group --><div class=\"wp-block-group\"><!-- wp:heading --><h2>Archives<\/h2><!-- \/wp:heading --><!-- wp:archives \/--><\/div><!-- \/wp:group -->"},"block-6":{"content":"<!-- wp:group --><div class=\"wp-block-group\"><!-- wp:heading --><h2>Categories<\/h2><!-- \/wp:heading --><!-- wp:categories \/--><\/div><!-- \/wp:group -->"}},"footer-sidebar-1":{"block-7":{"content":"<!-- wp:blockart\/image {\"clientId\":\"ea524318\",\"image\":{\"url\":\"https:\/\/optimus.qsandbox.com\/zqs\/qbcj\/site\/zakra-gym\/wp-content\/uploads\/2023\/10\/Logo.png\",\"id\":286,\"height\":69,\"width\":95,\"alt\":\"\"}} -->\n<figure class=\"blockart-image blockart-image-ea524318\"><img class=\"wp-image-286 hover-effect-static filter-none mask mask-none\" src=\"https:\/\/optimus.qsandbox.com\/zqs\/qbcj\/site\/zakra-gym\/wp-content\/uploads\/2023\/10\/Logo.png\" alt=\"\" height=\"69\" width=\"95\"\/><\/figure>\n<!-- \/wp:blockart\/image -->"},"block-8":{"content":"<!-- wp:blockart\/paragraph {\"clientId\":\"4da01c32\",\"text\":\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum est ultricies integer quis.\",\"typography\":{\"typography\":1,\"weight\":400,\"family\":\"Poppins\",\"size\":{\"desktop\":{\"value\":16,\"unit\":\"px\"}},\"lineHeight\":{\"desktop\":{\"value\":24,\"unit\":\"px\"}}}} -->\n<p class=\"blockart-paragraph blockart-paragraph-4da01c32\">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum est ultricies integer quis.<\/p>\n<!-- \/wp:blockart\/paragraph -->"},"block-9":{"content":"<!-- wp:widget-group {\"title\":\"Social Media\"} -->\n<h2 class=\"widget-title\">Social Media<\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:social-links {\"iconColor\":\"white\",\"iconColorValue\":\"#ffffff\",\"style\":{\"spacing\":{\"margin\":{\"right\":\"0\",\"left\":\"0\",\"top\":\"var:preset|spacing|60\",\"bottom\":\"0\"},\"blockGap\":{\"top\":\"0\",\"left\":\"var:preset|spacing|30\"}}},\"className\":\"is-style-logos-only\"} -->\n<ul class=\"wp-block-social-links has-icon-color is-style-logos-only\" style=\"margin-top:var(--wp--preset--spacing--60);margin-right:0;margin-bottom:0;margin-left:0\"><!-- wp:social-link {\"url\":\"#\",\"service\":\"facebook\"} \/-->\n\n<!-- wp:social-link {\"url\":\"#\",\"service\":\"twitter\"} \/-->\n\n<!-- wp:social-link {\"url\":\"#\",\"service\":\"instagram\"} \/-->\n\n<!-- wp:social-link {\"url\":\"#\",\"service\":\"vimeo\"} \/--><\/ul>\n<!-- \/wp:social-links --><\/div>\n<!-- \/wp:widget-group -->"}},"footer-sidebar-2":{"block-10":{"content":"<!-- wp:widget-group {\"title\":\"Latest Blog \"} -->\n<h2 class=\"widget-title\">Latest Blog <\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:latest-posts {\"displayPostDate\":true,\"align\":\"left\",\"style\":{\"elements\":{\"link\":{\"color\":{\"text\":\"var:preset|color|white\"}}},\"spacing\":{\"padding\":{\"top\":\"0\",\"bottom\":\"0\"},\"margin\":{\"top\":\"0\",\"bottom\":\"0\",\"left\":\"0\",\"right\":\"0\"}},\"typography\":{\"fontSize\":\"16px\"},\"color\":{\"text\":\"#f8f8f8\"}}} \/--><\/div>\n<!-- \/wp:widget-group -->"}},"footer-sidebar-3":{"block-11":{"content":"<!-- wp:widget-group {\"title\":\"Contact us\"} -->\n<h2 class=\"widget-title\">Contact us<\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:html -->\n<p><i class=\"fa fa-map-marker\"><\/i> 20 Gym Street, New York<\/p>\n<p><i class=\"fa fa-envelope\"><\/i> <a href=\"mailto:gym@fitnessclub.com\">gym@fitnessclub.com<\/a><\/p>\n<p><i class=\"fa fa-phone\"><\/i> <a href=\"tel:+154 253 568 256\"> +800-123-123-1234<\/a>\n<\/p>\n<p><i class=\"fa fa-mobile\"><\/i> +800-123-123-1235<\/p>\n<!-- \/wp:html --><\/div>\n<!-- \/wp:widget-group -->"}},"footer-sidebar-4":{"block-12":{"content":"<!-- wp:widget-group {\"title\":\"Opening Hour\"} -->\n<h2 class=\"widget-title\">Opening Hour<\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:list {\"style\":{\"typography\":{\"fontSize\":\"16px\"}}} -->\n<ul style=\"font-size:16px\"><!-- wp:list-item -->\n<li>Monday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 7 AM \u2013 6 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Tuesday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 6 AM \u2013 5 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Wednesday&nbsp; &nbsp; 7 AM \u2013 6 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Thursday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 6 AM \u2013 5 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Friday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 7 AM \u2013 6 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Saturday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;7 AM \u2013 1 PM<\/li>\n<!-- \/wp:list-item --><\/ul>\n<!-- \/wp:list --><\/div>\n<!-- \/wp:widget-group -->"}}}
+{"sidebar-right":{"block-2":{"content":"<!-- wp:search \/-->"},"block-3":{"content":"<!-- wp:group --><div class=\"wp-block-group\"><!-- wp:heading --><h2>Recent Posts<\/h2><!-- \/wp:heading --><!-- wp:latest-posts \/--><\/div><!-- \/wp:group -->"},"block-4":{"content":"<!-- wp:group --><div class=\"wp-block-group\"><!-- wp:heading --><h2>Recent Comments<\/h2><!-- \/wp:heading --><!-- wp:latest-comments {\"displayAvatar\":false,\"displayDate\":false,\"displayExcerpt\":false} \/--><\/div><!-- \/wp:group -->"},"search-1":{"title":"Search"},"recent-posts-1":{"title":"Popular Posts","number":3,"show_date":true},"categories-2":{"title":"","count":0,"hierarchical":0,"dropdown":0},"recent-posts-2":{"title":"Popular Posts","number":3,"show_date":false}},"sidebar-left":{"block-5":{"content":"<!-- wp:group --><div class=\"wp-block-group\"><!-- wp:heading --><h2>Archives<\/h2><!-- \/wp:heading --><!-- wp:archives \/--><\/div><!-- \/wp:group -->"},"block-6":{"content":"<!-- wp:group --><div class=\"wp-block-group\"><!-- wp:heading --><h2>Categories<\/h2><!-- \/wp:heading --><!-- wp:categories \/--><\/div><!-- \/wp:group -->"}},"footer-sidebar-1":{"block-7":{"content":"<!-- wp:blockart\/image {\"clientId\":\"ea524318\",\"image\":{\"url\":\"https:\/\/zakrademos.com\/gym-v2\/wp-content\/uploads\/sites\/134\/2023\/10\/Logo.png\",\"id\":286,\"height\":69,\"width\":95,\"alt\":\"\"}} -->\n<figure class=\"blockart-image blockart-image-ea524318\"><img class=\"wp-image-286 hover-effect-static filter-none mask mask-none\" src=\"https:\/\/zakrademos.com\/gym-v2\/wp-content\/uploads\/sites\/134\/2023\/10\/Logo.png\" alt=\"\" height=\"69\" width=\"95\"\/><\/figure>\n<!-- \/wp:blockart\/image -->"},"block-8":{"content":"<!-- wp:blockart\/paragraph {\"clientId\":\"4da01c32\",\"text\":\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum est ultricies integer quis.\",\"typography\":{\"typography\":1,\"weight\":400,\"family\":\"Poppins\",\"size\":{\"desktop\":{\"value\":16,\"unit\":\"px\"}},\"lineHeight\":{\"desktop\":{\"value\":24,\"unit\":\"px\"}}}} -->\n<p class=\"blockart-paragraph blockart-paragraph-4da01c32\">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Bibendum est ultricies integer quis.<\/p>\n<!-- \/wp:blockart\/paragraph -->"},"block-9":{"content":"<!-- wp:widget-group {\"title\":\"Social Media\"} -->\n<h2 class=\"widget-title\">Social Media<\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:social-links {\"iconColor\":\"white\",\"iconColorValue\":\"#ffffff\",\"style\":{\"spacing\":{\"margin\":{\"right\":\"0\",\"left\":\"0\",\"top\":\"var:preset|spacing|60\",\"bottom\":\"0\"},\"blockGap\":{\"top\":\"0\",\"left\":\"var:preset|spacing|30\"}}},\"className\":\"is-style-logos-only\"} -->\n<ul class=\"wp-block-social-links has-icon-color is-style-logos-only\" style=\"margin-top:var(--wp--preset--spacing--60);margin-right:0;margin-bottom:0;margin-left:0\"><!-- wp:social-link {\"url\":\"#\",\"service\":\"facebook\"} \/-->\n\n<!-- wp:social-link {\"url\":\"#\",\"service\":\"twitter\"} \/-->\n\n<!-- wp:social-link {\"url\":\"#\",\"service\":\"instagram\"} \/-->\n\n<!-- wp:social-link {\"url\":\"#\",\"service\":\"vimeo\"} \/--><\/ul>\n<!-- \/wp:social-links --><\/div>\n<!-- \/wp:widget-group -->"}},"footer-sidebar-2":{"block-10":{"content":"<!-- wp:widget-group {\"title\":\"Latest Blog \"} -->\n<h2 class=\"widget-title\">Latest Blog <\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:latest-posts {\"displayPostDate\":true,\"align\":\"left\",\"style\":{\"elements\":{\"link\":{\"color\":{\"text\":\"var:preset|color|white\"}}},\"spacing\":{\"padding\":{\"top\":\"0\",\"bottom\":\"0\"},\"margin\":{\"top\":\"0\",\"bottom\":\"0\",\"left\":\"0\",\"right\":\"0\"}},\"typography\":{\"fontSize\":\"16px\"},\"color\":{\"text\":\"#f8f8f8\"}}} \/--><\/div>\n<!-- \/wp:widget-group -->"}},"footer-sidebar-3":{"block-11":{"content":"<!-- wp:widget-group {\"title\":\"Contact us\"} -->\n<h2 class=\"widget-title\">Contact us<\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:html -->\n<p><i class=\"fa fa-map-marker\"><\/i> 20 Gym Street, New York<\/p>\n<p><i class=\"fa fa-envelope\"><\/i> <a href=\"mailto:gym@fitnessclub.com\">gym@fitnessclub.com<\/a><\/p>\n<p><i class=\"fa fa-phone\"><\/i> <a href=\"tel:+154 253 568 256\"> +800-123-123-1234<\/a>\n<\/p>\n<p><i class=\"fa fa-mobile\"><\/i> +800-123-123-1235<\/p>\n<!-- \/wp:html --><\/div>\n<!-- \/wp:widget-group -->"}},"footer-sidebar-4":{"block-12":{"content":"<!-- wp:widget-group {\"title\":\"Opening Hour\"} -->\n<h2 class=\"widget-title\">Opening Hour<\/h2><div class=\"wp-widget-group__inner-blocks\"><!-- wp:list {\"style\":{\"typography\":{\"fontSize\":\"16px\"}}} -->\n<ul style=\"font-size:16px\"><!-- wp:list-item -->\n<li>Monday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 7 AM \u2013 6 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Tuesday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 6 AM \u2013 5 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Wednesday&nbsp; &nbsp; 7 AM \u2013 6 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Thursday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 6 AM \u2013 5 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Friday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 7 AM \u2013 6 PM<\/li>\n<!-- \/wp:list-item -->\n\n<!-- wp:list-item -->\n<li>Saturday&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;7 AM \u2013 1 PM<\/li>\n<!-- \/wp:list-item --><\/ul>\n<!-- \/wp:list --><\/div>\n<!-- \/wp:widget-group -->"}}}