From 5ab9463185d2032cba8251151e2a203eaacaf129 Mon Sep 17 00:00:00 2001
From: Saiful Islam <codersaiful@gmail.com>
Date: Tue, 2 Mar 2021 14:18:38 +0600
Subject: [PATCH 1/9] js code added

---
 inc/widgets/menu.php | 134 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 3 deletions(-)

diff --git a/inc/widgets/menu.php b/inc/widgets/menu.php
index 960c5187..50596756 100644
--- a/inc/widgets/menu.php
+++ b/inc/widgets/menu.php
@@ -80,13 +80,13 @@ protected function render() {
             echo wp_kses_post( '<h2 class="hidden_text">' . __( 'There is no menu available. Please create First' ) . '</h2>' );
             return;
         }
-        
+        $wrapper_id = 'ultraaddons-navigation-' . $this->get_id();
         $this->add_render_attribute( 'wrapper', 'class', [
             'ultraaddons-navigation-wrapper',
             'ultraaddons-navigation',
-            'ultraaddons-navigation' . $this->get_id(),
+            $wrapper_id,
         ] );
-        $this->add_render_attribute( 'wrapper', 'id', 'ultraaddons-navigation' );
+        $this->add_render_attribute( 'wrapper', 'id', $wrapper_id );
         $menu_id = $settings['menu'];
 
         $args = array(
@@ -137,6 +137,121 @@ protected function render() {
             </div>
             
         </nav>
+<script type="text/javascript" id="ua-menu-">
+/**
+ * File navigation.js.
+ *
+ * Handles toggling the navigation menu for small screens and enables TAB key
+ * navigation support for dropdown menus.
+ */
+( function() {
+        navigationHandle( '<?php echo esc_html( $wrapper_id ); ?>' );
+	function navigationHandle( element_id ){
+            
+            //element_id = 'site-navigation'
+            const siteNavigation = document.getElementById( element_id );
+
+            // Return early if the navigation don't exist.
+            if ( ! siteNavigation ) {
+                    return;
+            }
+
+            const button = siteNavigation.getElementsByTagName( 'button' )[ 0 ];
+
+            // Return early if the button don't exist.
+            if ( 'undefined' === typeof button ) {
+                    return;
+            }
+
+            const menu = siteNavigation.getElementsByTagName( 'ul' )[ 0 ];
+
+            // Hide menu toggle button if menu is empty and return early.
+            if ( 'undefined' === typeof menu ) {
+                    button.style.display = 'none';
+                    return;
+            }
+
+            if ( ! menu.classList.contains( 'nav-menu' ) ) {
+                    menu.classList.add( 'nav-menu' );
+            }
+
+            // Toggle the .toggled class and the aria-expanded value each time the button is clicked.
+            button.addEventListener( 'click', function() {
+                    siteNavigation.classList.toggle( 'expanded' );
+
+                    if ( button.getAttribute( 'aria-expanded' ) === 'true' ) {
+                            button.setAttribute( 'aria-expanded', 'false' );
+                    } else {
+                            button.setAttribute( 'aria-expanded', 'true' );
+                    }
+            } );
+
+            // Remove the .toggled class and set aria-expanded to false when the user clicks outside the navigation.
+            document.addEventListener( 'click', function( event ) {
+                    const isClickInside = siteNavigation.contains( event.target );
+
+                    if ( ! isClickInside ) {
+                            siteNavigation.classList.remove( 'expanded' );
+                            button.setAttribute( 'aria-expanded', 'false' );
+                    }
+            } );
+
+            // Get all the link elements within the menu.
+            const links = menu.getElementsByTagName( 'a' );
+
+            // Get all the link elements with children within the menu.
+            const linksWithChildren = menu.querySelectorAll( '.menu-item-has-children > a, .page_item_has_children > a' );
+            
+            jQuery('#' + element_id + ' .menu-item-has-children > a, .page_item_has_children > a').after('<i class="available-submenu"></i>');
+
+            // Toggle focus each time a menu link is focused or blurred.
+            for ( const link of links ) {
+//                    link.addEventListener( 'focus', toggleFocus, true );
+                    link.addEventListener( 'blur', toggleFocus, true );
+            }
+
+            // Toggle focus each time a menu link with children receive a touch event.
+            for ( const link of linksWithChildren ) {
+//                    link.addEventListener( 'touchstart', toggleFocus, true );
+            }
+            jQuery('#' + element_id).on('click', '.available-submenu', function(e){
+                e.preventDefault();
+                jQuery(this).closest('.menu-item-has-children').toggleClass('focus');
+                //jQuery(this).closest('.menu-item-has-children').toggleClass('expand');
+            });
+           
+            /**
+             * Sets or removes .focus class on an element.
+             */
+            function toggleFocus() {
+                    if ( event.type === 'focus' || event.type === 'blur' || event.type === 'touchstart' ) {
+                            let self = this;
+                            // Move up through the ancestors of the current link until we hit .nav-menu.
+                            while ( ! self.classList.contains( 'nav-menu' ) ) {
+                                    // On li elements toggle the class .focus.
+                                    if ( 'li' === self.tagName.toLowerCase() ) {
+                                            self.classList.toggle( 'focus' );
+                                    }
+                                    self = self.parentNode;
+                            }
+                    }
+
+//                    if ( event.type === 'touchstart' ) {
+//                            const menuItem = this.parentNode;
+//                            event.preventDefault();
+//                            for ( const link of menuItem.parentNode.children ) {
+//                                    if ( menuItem !== link ) {
+//                                            link.classList.remove( 'focus' );
+//                                    }
+//                            }
+//                            menuItem.classList.toggle( 'focus' );
+//                    }
+            }
+            
+            
+        }
+}() );
+</script>
         <?php
 
     }
@@ -288,6 +403,19 @@ protected function content_general_controls() {
                 ]
         );
         
+        $this->add_control(
+                'mega_menu',
+                [
+                        'label' => __( 'General Mega Menu', 'ultraaddons' ),
+                        'description' => __( 'All submenu will display in two line', 'ultraaddons' ),
+                        'type' => Controls_Manager::SWITCHER,
+                        'label_on' => __( 'On', 'ultraaddons' ),
+                        'label_off' => __( 'Off', 'ultraaddons' ),
+                        'return_value' => 'yes',
+                        'default' => '',
+                        'prefix_class' => 'mega-menu-'
+                ]
+        );
         
         $this->end_controls_section();
     }

From d7bb1132a0843da36d2d7c3f3536494161602a40 Mon Sep 17 00:00:00 2001
From: Saiful Islam <codersaiful@gmail.com>
Date: Tue, 2 Mar 2021 14:19:09 +0600
Subject: [PATCH 2/9] ua-ultraaddons-[widget] class has removed

---
 assets/css/widgets.css             |  12 +-
 assets/css/widgets/button.css      |  16 +-
 assets/css/widgets/cart.css        |  58 ++---
 assets/css/widgets/menu.css        | 358 ++++++++++++++---------------
 assets/css/widgets/price-table.css |  12 +-
 assets/css/widgets/search.css      |  42 ++--
 inc/base/base.php                  |   4 +-
 7 files changed, 251 insertions(+), 251 deletions(-)

diff --git a/assets/css/widgets.css b/assets/css/widgets.css
index 75010681..da1c5a1f 100644
--- a/assets/css/widgets.css
+++ b/assets/css/widgets.css
@@ -52,14 +52,14 @@ body:not(.elementor-page) .ultraaddons-container{
 /*******************************
 * Common of All Widgets
 ********************************/
-.ultraaddons-element .hidden_text,
-.ultraaddons-element .hidden_message,
-.ultraaddons-element .hidden{
+.ua-element .hidden_text,
+.ua-element .hidden_message,
+.ua-element .hidden{
     display: none;
 }
-.elementor-element-edit-mode.ultraaddons-element .hidden_text,
-.elementor-element-edit-mode.ultraaddons-element .hidden_message,
-.elementor-element-edit-mode.ultraaddons-element .hidden{
+.elementor-element-edit-mode.ua-element .hidden_text,
+.elementor-element-edit-mode.ua-element .hidden_message,
+.elementor-element-edit-mode.ua-element .hidden{
     display: block !important;
     color: #D00;
 }
\ No newline at end of file
diff --git a/assets/css/widgets/button.css b/assets/css/widgets/button.css
index c0b27efa..4cf49ddb 100644
--- a/assets/css/widgets/button.css
+++ b/assets/css/widgets/button.css
@@ -62,36 +62,36 @@
 .ultraaddons-button-wrapper.left {
     text-align: left;
 }
-.ultraaddons-element.ua-element-button .ultraaddons-button-wrapper {
+.ua-element.ua-element-button .ultraaddons-button-wrapper {
     display: flex;
     column-gap: 20px;
 }
 
-.ultraaddons-element.ua-element-button .ultraaddons-button {
+.ua-element.ua-element-button .ultraaddons-button {
     display: flex;
     justify-content: center;
 }
-.ultraaddons-element.ua-element-button .ultraaddons-button .ultraaddons-button-icon.align-left {
+.ua-element.ua-element-button .ultraaddons-button .ultraaddons-button-icon.align-left {
     order: 5;
     margin-right: 10px;
 }
-.ultraaddons-element.ua-element-button .ultraaddons-button .ultraaddons-button-text {
+.ua-element.ua-element-button .ultraaddons-button .ultraaddons-button-text {
     order: 10;
 }
 
-.ultraaddons-element.ua-element-button .ultraaddons-button .ultraaddons-button-icon.align-right {
+.ua-element.ua-element-button .ultraaddons-button .ultraaddons-button-icon.align-right {
     order: 20;
     margin-left: 10px;
 }
 
-.ultraaddons-element.ua-element-button .ultraaddons-button-wrapper.center {
+.ua-element.ua-element-button .ultraaddons-button-wrapper.center {
     justify-content: center;
 }
 
-.ultraaddons-element.ua-element-button .ultraaddons-button-wrapper.left{
+.ua-element.ua-element-button .ultraaddons-button-wrapper.left{
     justify-content: flex-start;
 }
 
-.ultraaddons-element.ua-element-button .ultraaddons-button-wrapper.right{
+.ua-element.ua-element-button .ultraaddons-button-wrapper.right{
     justify-content: flex-end;
 }
\ No newline at end of file
diff --git a/assets/css/widgets/cart.css b/assets/css/widgets/cart.css
index 65291995..99fdb39a 100644
--- a/assets/css/widgets/cart.css
+++ b/assets/css/widgets/cart.css
@@ -1,4 +1,4 @@
-.ua-ultraaddons-cart .ultraaddons-cart-wrapper ul.site-elementor-cart {
+.ua-element-cart .ultraaddons-cart-wrapper ul.site-elementor-cart {
     display: flex;
     align-items: center;
     justify-content: flex-end;
@@ -7,7 +7,7 @@
     padding: 0;
     margin: 0;
 }
-.ua-ultraaddons-cart .ultraaddons-cart-wrapper ul.site-elementor-cart > li.minicart-content-wrapper {
+.ua-element-cart .ultraaddons-cart-wrapper ul.site-elementor-cart > li.minicart-content-wrapper {
     display: none;
     position: absolute;
     z-index: 210;
@@ -15,34 +15,34 @@
     top: 100%;
 }
 
-.ua-ultraaddons-cart .ultraaddons-cart-wrapper ul.site-elementor-cart li.minicart-content-wrapper .widget_shopping_cart {
+.ua-element-cart .ultraaddons-cart-wrapper ul.site-elementor-cart li.minicart-content-wrapper .widget_shopping_cart {
     background: white;
     border: 0;
     padding: 25px;
     box-shadow: 0 5px 40px 0 rgb(10 10 25 / 10%);
     margin-top: 40px;
 }
-.ua-ultraaddons-cart .widget_shopping_cart h2.widgettitle {
+.ua-element-cart .widget_shopping_cart h2.widgettitle {
     margin: 0 !important;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart.cart_list {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart.cart_list {
     margin: 0;
     padding: 0;
     list-style: none;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a>img,
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.product_list_widget li a>img {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a>img,
+.ua-element-cart .widget_shopping_cart_content ul.product_list_widget li a>img {
     left: 0;
     top: -10px;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item {
     display: flex;
     align-items: flex-start;
     padding: 20px 0;
     position: relative;
     border-bottom: 1px solid #d7d7d77d;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item span.quantity {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item span.quantity {
     right: 0;
     position: absolute;
 }
@@ -70,17 +70,17 @@
     padding: 3px 12px;
     color: white;
 }
-.ua-ultraaddons-cart .ultraaddons-cart-wrapper ul.site-elementor-cart:hover > li.minicart-content-wrapper,
+.ua-element-cart .ultraaddons-cart-wrapper ul.site-elementor-cart:hover > li.minicart-content-wrapper,
 .elementor-element.elementor-element-edit-mode.see-hover-in-admin-yes .ultraaddons-cart-wrapper ul.site-elementor-cart > li.minicart-content-wrapper,
 .elementor-element.expand-always-yes .ultraaddons-cart-wrapper ul.site-elementor-cart > li.minicart-content-wrapper,
 /*.elementor-element.see-hover-in-admin-yes .ultraaddons-cart-wrapper ul.site-elementor-cart > li.minicart-content-wrapper,*/
-.ua-ultraaddons-cart .ultraaddons-cart-wrapper ul.site-elementor-cart:focus > li.minicart-content-wrapper {
+.ua-element-cart .ultraaddons-cart-wrapper ul.site-elementor-cart:focus > li.minicart-content-wrapper {
     display: block;
 }
 .elementor-element.elementor-element-edit-mode.see-hover-in-admin-yes li.minicart-content-wrapper{}
 .elementor-element.expand-always-yes li.minicart-content-wrapper{}
 
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a {
     font-size: 16px;
     line-height: 22px;
     font-weight: 600;
@@ -91,8 +91,8 @@
     text-decoration: none;
     outline: none;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a.remove,
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.product_list_widget li a.remove {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a.remove,
+.ua-element-cart .widget_shopping_cart_content ul.product_list_widget li a.remove {
     font-weight: 300;
     color: #0fc392;
     z-index: 2;
@@ -105,7 +105,7 @@
     height: 100%;
     
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a:not(.remove) {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a:not(.remove) {
     display: flex;
     padding-left: 0px;
     position: relative;
@@ -115,36 +115,36 @@
     /* justify-content: flex-start; */
     text-align: left;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a>img,
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.product_list_widget li a>img {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a>img,
+.ua-element-cart .widget_shopping_cart_content ul.product_list_widget li a>img {
     max-width: 60px;
     height: auto;
     float: left;
     margin-right: 10px;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content .woocommerce-mini-cart__total.total strong,
-.ua-ultraaddons-cart .widget_shopping_cart_content span.woocommerce-Price-amount.amount {
+.ua-element-cart .widget_shopping_cart_content .woocommerce-mini-cart__total.total strong,
+.ua-element-cart .widget_shopping_cart_content span.woocommerce-Price-amount.amount {
     font-weight: 600;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content span.woocommerce-Price-amount.amount {
+.ua-element-cart .widget_shopping_cart_content span.woocommerce-Price-amount.amount {
     background-color: transparent;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.product_list_widget li a.remove:before{
+.ua-element-cart .widget_shopping_cart_content ul.product_list_widget li a.remove:before{
     display: none;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a.remove, .ua-ultraaddons-cart .widget_shopping_cart_content ul.product_list_widget li a.remove {
+.ua-element-cart .widget_shopping_cart_content ul.woocommerce-mini-cart li.woocommerce-mini-cart-item.mini_cart_item a.remove, .ua-element-cart .widget_shopping_cart_content ul.product_list_widget li a.remove {
     position: relative;
     width: 20px;
     text-indent: unset;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content p.woocommerce-mini-cart__total.total {
+.ua-element-cart .widget_shopping_cart_content p.woocommerce-mini-cart__total.total {
     display: flex;
     justify-content: space-between;
     align-items: center;
     flex-wrap: wrap;
     margin: 15px 0;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content .woocommerce-mini-cart__buttons.buttons a {
+.ua-element-cart .widget_shopping_cart_content .woocommerce-mini-cart__buttons.buttons a {
     display: block;
     width: 100%;
     text-align: center;
@@ -161,19 +161,19 @@
     text-decoration: none;
     outline: none;
 }
-.ua-ultraaddons-cart .widget_shopping_cart_content .woocommerce-mini-cart__buttons.buttons a:hover {
+.ua-element-cart .widget_shopping_cart_content .woocommerce-mini-cart__buttons.buttons a:hover {
     border-color: #0fc392;
     background: transparent;
     color: #0fc392;
 }
-.elementor-align-left.ua-ultraaddons-cart .ultraaddons-cart-wrapper ul.site-elementor-cart {
+.elementor-align-left.ua-element-cart .ultraaddons-cart-wrapper ul.site-elementor-cart {
     justify-content: flex-start;
     margin: 0;
 }
-.elementor-align-left.ua-ultraaddons-cart .ultraaddons-cart-wrapper ul.site-elementor-cart li.cart-text-li {
+.elementor-align-left.ua-element-cart .ultraaddons-cart-wrapper ul.site-elementor-cart li.cart-text-li {
     padding-left: 0;
 }
-.elementor-align-center.ua-ultraaddons-cart .ultraaddons-cart-wrapper ul.site-elementor-cart {
+.elementor-align-center.ua-element-cart .ultraaddons-cart-wrapper ul.site-elementor-cart {
     justify-content: center;
     margin: 0;
 }
@@ -187,7 +187,7 @@
 .cart-title-align-right h2.widgettitle {
     text-align: right;
 }
-.ua-ultraaddons-cart .ultraaddons-cart-wrapper .hide-content-yes{
+.ua-element-cart .ultraaddons-cart-wrapper .hide-content-yes{
     display: none !important;
 }
 .ultraaddons-cart-wrapper span.count {
diff --git a/assets/css/widgets/menu.css b/assets/css/widgets/menu.css
index 5a9f4685..2feb200e 100644
--- a/assets/css/widgets/menu.css
+++ b/assets/css/widgets/menu.css
@@ -1,180 +1,180 @@
-.ua-ultraaddons-menu ul.ua-menu {
-    /*display: none;*/
-    list-style: none;
-    margin: 0;
-    padding-left: 0;
-}
-.ua-ultraaddons-menu ul.ua-menu li > ul{
-    /*display: none;*/
-    list-style: none;
-}
-
-button.ua-menu-toggle {
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJmZWF0aGVyIGZlYXRoZXItbWVudSI+PGxpbmUgeDE9IjMiIHkxPSIxMiIgeDI9IjIxIiB5Mj0iMTIiPjwvbGluZT48bGluZSB4MT0iMyIgeTE9IjYiIHgyPSIyMSIgeTI9IjYiPjwvbGluZT48bGluZSB4MT0iMyIgeTE9IjE4IiB4Mj0iMjEiIHkyPSIxOCI+PC9saW5lPjwvc3ZnPg==);
-    color: #0fc392;
-}
-.ua-ultraaddons-menu ul.ua-menu > li {
-    position: relative;
-    display: block;
-}
-.ua-ultraaddons-menu ul.ua-menu li.menu-item-has-children {
-    position: relative;
-    margin-right: 20px;
-    padding-right: 20px;
-}
-.ua-ultraaddons-menu ul.ua-menu li:after,
-.ua-ultraaddons-menu ul.ua-menu li:before {
-    content: "";
-    display: block;
-    clear: both;
-}
-.ua-ultraaddons-menu ul.ua-menu > li > a,
-.ua-ultraaddons-menu ul.ua-menu .focus a,
-.ua-ultraaddons-menu ul.ua-menu a {
-    color: #21272c;
-    font-size: 16px;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-    font-weight: 500;
-    position: relative;
-    padding: 10px;
-}
-.ua-ultraaddons-menu ul.ua-menu li a {
-    display: block;
-}
-.ua-ultraaddons-menu ul.ua-menu li::before {
-    position: absolute;
-    color: #21272c;
-}
-.ua-ultraaddons-menu ul.ua-menu li.menu-item-has-children::before {
-    right: 5px;
-    top: 34%;
-}
-.ua-ultraaddons-menu ul.ua-menu .menu-item-has-children::before {
-    content: "\f107";
-    font-family: "Font Awesome 5 Free";
-    font-weight: 800;
-    font-style: normal;
-    font-size: 20px;
-}
-/*.ua-ultraaddons-menu ul.ua-menu .focus > .available-submenu::before {
-    content: "\f106";
-}*/
-
-/* Sub Menu */
-/*.ua-ultraaddons-menu ul.ua-menu ul {
-    box-shadow: 0 3px 3px rgb(0 0 0 / 20%);
-    float: left;
-    position: absolute;
-    top: 100%;
-    left: -999em;
-    z-index: 99999;
-}*/
-
-
-@media (min-width: 37.5em){
-    .ua-ultraaddons-menu .ua-nav-inside button.ua-menu-toggle {
-        display: none;
-    }
-    
-}
-@media only screen and (min-width: 991px){
-    /*.menu-toggle,*/
-    .ua-ultraaddons-menu ul.ua-menu {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: center;
-    }
-    .ua-ultraaddons-menu ul.ua-menu > li > .available-submenu {
-        right: -4px;
-        top: 31px;
-    }
-    .ua-ultraaddons-menu ul.ua-menu .available-submenu::before {
-        font-size: 14px;
-    }
-    .ua-ultraaddons-menu ul.ua-menu li > ul{
-        display: none;
-    }
-    .ua-ultraaddons-menu ul.ua-menu > li > a:before {
-        position: absolute;
-        bottom: 0;
-        left: 50%;
-        transform: translateX(-50%);
-        content: "";
-        background-color: #0fc392;
-        background-color: var(--medilac-primary);
-        width: 0;
-        height: 2px;
-        visibility: hidden;
-        opacity: 0;
-        transition: 0.3s;
-        -webkit-transition: 0.3s;
-    }
-    .ua-ultraaddons-menu ul.ua-menu > li.current-menu-ancestor > a:before,
-    .ua-ultraaddons-menu ul.ua-menu > li.current-menu-item >a:before,
-    .ua-ultraaddons-menu ul.ua-menu > li > a:focus:before,
-    .ua-ultraaddons-menu ul.ua-menu > li.focus > a:hover:before,
-    .ua-ultraaddons-menu ul.ua-menu > li > a:hover:before {
-        width: 100%;
-        visibility: visible;
-        opacity: 1;
-    }
-    .ua-ultraaddons-menu ul.ua-menu > li > a {
-        padding: 30px 10px;
-    }
-    .ua-ultraaddons-menu ul.ua-menu > li.current-menu-ancestor > a,
-    .ua-ultraaddons-menu ul.ua-menu > li.current-menu-item > a,
-    .ua-ultraaddons-menu ul.ua-menu > li > a:focus,
-    .ua-ultraaddons-menu ul.ua-menu > li > a:hover {
-        color: #0fc392;
-        outline: none;
-    }
-    .ua-ultraaddons-menu ul.ua-menu li.menu-item-has-children .sub-menu>li>a {
-        display: inline-block;
-        transition: 0.3s;
-        font-weight: 500;
-        padding: 12px 15px 12px 15px;
-        color: #21272C;
-        font-size: 15px;
-        display: block;
-        width: 100%;
-        background-color: #fff;
-        border-bottom: 1px solid #ddd;
-        transition: 0.3s;
-        border-radius: 0;
-        transition: 0.3s;
-        -webkit-transition: 0.3s;
-    }
-    .ua-ultraaddons-menu ul.ua-menu li:active .sub-menu,
-    .ua-ultraaddons-menu ul.ua-menu li:hover .sub-menu,
-    .ua-ultraaddons-menu ul.ua-menu li:focus .sub-menu,
-    .ua-ultraaddons-menu ul.ua-menu li.menu-item-has-children.focus>ul.sub-menu,
-    .ua-ultraaddons-menu ul.ua-menu li.focus .sub-menu {
-        display: block;
-        position: absolute;
-        text-align: left;
-        background: #fff;
-        background: var(--medilac-foreground);
-        z-index: 9;
-        width: 200px;
-        padding: 0;
-        box-shadow: 0 0 10px #0000001f;
-        border-bottom-left-radius: 5px;
-        border-bottom-right-radius: 5px;
-        flex-direction: column;
-    }
-    .ua-ultraaddons-menu ul.ua-menu li:hover .sub-menu .sub-menu {
-        display: none;
-    }
-    .ua-ultraaddons-menu ul.ua-menu li.menu-item-has-children:hover>.sub-menu,
-    .ua-ultraaddons-menu ul.ua-menu li.menu-item-has-children:focus>.sub-menu,
-    .ua-ultraaddons-menu ul.ua-menu li.menu-item-has-children:active>.sub-menu {
-        transition-delay: 0s;
-        visibility: visible;
-        opacity: 1;
-        display: block;
-    }
-    .ua-ultraaddons-menu ul.ua-menu li.menu-item-has-children .sub-menu li.menu-item-has-children .sub-menu {
-        top: 0;
-        left: 100%;
-    }
+.ua-element-menu ul.ua-menu {
+    /*display: none;*/
+    list-style: none;
+    margin: 0;
+    padding-left: 0;
+}
+.ua-element-menu ul.ua-menu li > ul{
+    /*display: none;*/
+    list-style: none;
+}
+
+button.ua-menu-toggle {
+    /*background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJmZWF0aGVyIGZlYXRoZXItbWVudSI+PGxpbmUgeDE9IjMiIHkxPSIxMiIgeDI9IjIxIiB5Mj0iMTIiPjwvbGluZT48bGluZSB4MT0iMyIgeTE9IjYiIHgyPSIyMSIgeTI9IjYiPjwvbGluZT48bGluZSB4MT0iMyIgeTE9IjE4IiB4Mj0iMjEiIHkyPSIxOCI+PC9saW5lPjwvc3ZnPg==);*/
+    /*color: #0fc392;*/
+}
+.ua-element-menu ul.ua-menu > li {
+    position: relative;
+    display: block;
+}
+.ua-element-menu ul.ua-menu li.menu-item-has-children {
+    position: relative;
+    margin-right: 20px;
+    padding-right: 20px;
+}
+.ua-element-menu ul.ua-menu li:after,
+.ua-element-menu ul.ua-menu li:before {
+    content: "";
+    display: block;
+    clear: both;
+}
+.ua-element-menu ul.ua-menu > li > a,
+.ua-element-menu ul.ua-menu .focus a,
+.ua-element-menu ul.ua-menu a {
+    color: #21272c;
+    font-size: 16px;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+    font-weight: 500;
+    position: relative;
+    padding: 10px;
+}
+.ua-element-menu ul.ua-menu li a {
+    display: block;
+}
+.ua-element-menu ul.ua-menu li::before {
+    position: absolute;
+    color: #21272c;
+}
+.ua-element-menu ul.ua-menu li.menu-item-has-children::before {
+    right: 5px;
+    top: 34%;
+}
+.ua-element-menu ul.ua-menu .menu-item-has-children::before {
+    content: "\f107";
+    font-family: "Font Awesome 5 Free";
+    font-weight: 800;
+    font-style: normal;
+    font-size: 20px;
+}
+/*.ua-element-menu ul.ua-menu .focus > .available-submenu::before {
+    content: "\f106";
+}*/
+
+/* Sub Menu */
+/*.ua-element-menu ul.ua-menu ul {
+    box-shadow: 0 3px 3px rgb(0 0 0 / 20%);
+    float: left;
+    position: absolute;
+    top: 100%;
+    left: -999em;
+    z-index: 99999;
+}*/
+
+
+@media (min-width: 37.5em){
+    .ua-element-menu .ua-nav-inside button.ua-menu-toggle {
+        display: none;
+    }
+    
+}
+@media only screen and (min-width: 991px){
+    /*.menu-toggle,*/
+    .ua-element-menu ul.ua-menu {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+    }
+    .ua-element-menu ul.ua-menu > li > .available-submenu {
+        right: -4px;
+        top: 31px;
+    }
+    .ua-element-menu ul.ua-menu .available-submenu::before {
+        font-size: 14px;
+    }
+    .ua-element-menu ul.ua-menu li > ul{
+        display: none;
+    }
+    .ua-element-menu ul.ua-menu > li > a:before {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        transform: translateX(-50%);
+        content: "";
+        background-color: #0fc392;
+        background-color: var(--medilac-primary);
+        width: 0;
+        height: 2px;
+        visibility: hidden;
+        opacity: 0;
+        transition: 0.3s;
+        -webkit-transition: 0.3s;
+    }
+    .ua-element-menu ul.ua-menu > li.current-menu-ancestor > a:before,
+    .ua-element-menu ul.ua-menu > li.current-menu-item >a:before,
+    .ua-element-menu ul.ua-menu > li > a:focus:before,
+    .ua-element-menu ul.ua-menu > li.focus > a:hover:before,
+    .ua-element-menu ul.ua-menu > li > a:hover:before {
+        width: 100%;
+        visibility: visible;
+        opacity: 1;
+    }
+    .ua-element-menu ul.ua-menu > li > a {
+        padding: 30px 10px;
+    }
+    .ua-element-menu ul.ua-menu > li.current-menu-ancestor > a,
+    .ua-element-menu ul.ua-menu > li.current-menu-item > a,
+    .ua-element-menu ul.ua-menu > li > a:focus,
+    .ua-element-menu ul.ua-menu > li > a:hover {
+        color: #0fc392;
+        outline: none;
+    }
+    .ua-element-menu ul.ua-menu li.menu-item-has-children .sub-menu>li>a {
+        display: inline-block;
+        transition: 0.3s;
+        font-weight: 500;
+        padding: 12px 15px 12px 15px;
+        color: #21272C;
+        font-size: 15px;
+        display: block;
+        width: 100%;
+        background-color: #fff;
+        border-bottom: 1px solid #ddd;
+        transition: 0.3s;
+        border-radius: 0;
+        transition: 0.3s;
+        -webkit-transition: 0.3s;
+    }
+    .ua-element-menu ul.ua-menu li:active .sub-menu,
+    .ua-element-menu ul.ua-menu li:hover .sub-menu,
+    .ua-element-menu ul.ua-menu li:focus .sub-menu,
+    .ua-element-menu ul.ua-menu li.menu-item-has-children.focus>ul.sub-menu,
+    .ua-element-menu ul.ua-menu li.focus .sub-menu {
+        display: block;
+        position: absolute;
+        text-align: left;
+        background: #fff;
+        background: var(--medilac-foreground);
+        z-index: 9;
+        width: 200px;
+        padding: 0;
+        box-shadow: 0 0 10px #0000001f;
+        border-bottom-left-radius: 5px;
+        border-bottom-right-radius: 5px;
+        flex-direction: column;
+    }
+    .ua-element-menu ul.ua-menu li:hover .sub-menu .sub-menu {
+        display: none;
+    }
+    .ua-element-menu ul.ua-menu li.menu-item-has-children:hover>.sub-menu,
+    .ua-element-menu ul.ua-menu li.menu-item-has-children:focus>.sub-menu,
+    .ua-element-menu ul.ua-menu li.menu-item-has-children:active>.sub-menu {
+        transition-delay: 0s;
+        visibility: visible;
+        opacity: 1;
+        display: block;
+    }
+    .ua-element-menu ul.ua-menu li.menu-item-has-children .sub-menu li.menu-item-has-children .sub-menu {
+        top: 0;
+        left: 100%;
+    }
 }
\ No newline at end of file
diff --git a/assets/css/widgets/price-table.css b/assets/css/widgets/price-table.css
index 6a561b4e..7ea5f908 100644
--- a/assets/css/widgets/price-table.css
+++ b/assets/css/widgets/price-table.css
@@ -66,20 +66,20 @@ span.ua-price-table__period.ua-typo-excluded {
 .ultraaddons-featured-item-ribbon-top.ultraaddons-featured-item-ribbon-left .ua-price-table__ribbon{left: 0;top: 0;}
 .ultraaddons-featured-item-ribbon-top.ultraaddons-featured-item-ribbon-right .ua-price-table__ribbon{right: 0;top: 0;}
 
-.ua-ultraaddons-price-table .ua-button.ua-size-xs {
+.ua-element-price-table .ua-button.ua-size-xs {
     padding: 4px 18px 4px 18px;
 }
-.ua-ultraaddons-price-table .ua-button.ua-size-sm {
+.ua-element-price-table .ua-button.ua-size-sm {
     padding: 10px 25px;
 }
-.ua-ultraaddons-price-table .ua-button.ua-size-md {
+.ua-element-price-table .ua-button.ua-size-md {
     padding: 15px 40px;
 }
-.ua-ultraaddons-price-table .ua-button.ua-size-lg {
+.ua-element-price-table .ua-button.ua-size-lg {
     padding: 15px 46px;
     font-size: 22px;
 }
-.ua-ultraaddons-price-table .ua-button.ua-size-xl {
+.ua-element-price-table .ua-button.ua-size-xl {
     padding: 18px 75px;
     font-size: 30px;
 }
@@ -125,4 +125,4 @@ span.currency-inner-wrapper span.ua-price-table__currency_sep {
 .pricing-table-temp-2 .ua-pricing-table-icon {
     color: #efefef;
 }
-.ultraaddons-element.ua-element-price-table .ua-button{text-decoration: none;}
\ No newline at end of file
+.ua-element.ua-element-price-table .ua-button{text-decoration: none;}
\ No newline at end of file
diff --git a/assets/css/widgets/search.css b/assets/css/widgets/search.css
index 81c8f176..ccc6631b 100644
--- a/assets/css/widgets/search.css
+++ b/assets/css/widgets/search.css
@@ -1,12 +1,12 @@
 
-.ultraaddons-element form.search-form,
-.ultraaddons-element form.woocommerce-product-search{
+.ua-element form.search-form,
+.ua-element form.woocommerce-product-search{
   position: relative;
   display: flex;
 }
 
-.ultraaddons-element form.search-form input.search-field,
-.ultraaddons-element form.woocommerce-product-search input.search-field{
+.ua-element form.search-form input.search-field,
+.ua-element form.woocommerce-product-search input.search-field{
   width: 100%;
   height: 58px;
   border: 1px solid #e2ebf1;
@@ -16,33 +16,33 @@
   color: #5c6b79;
   color: var(--medilac-light-dark);
 }
-.ultraaddons-element form.search-form label{width: 100%;}
-.ultraaddons-element form.search-form input.search-field::-webkit-input-placeholder,
-.ultraaddons-element form.woocommerce-product-search input.search-field::-webkit-input-placeholder{
+.ua-element form.search-form label{width: 100%;}
+.ua-element form.search-form input.search-field::-webkit-input-placeholder,
+.ua-element form.woocommerce-product-search input.search-field::-webkit-input-placeholder{
   opacity:1;
   -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 }
 
-.ultraaddons-element form.search-form input.search-field::-moz-placeholder,
-.ultraaddons-element form.woocommerce-product-search input.search-field::-moz-placeholder{
+.ua-element form.search-form input.search-field::-moz-placeholder,
+.ua-element form.woocommerce-product-search input.search-field::-moz-placeholder{
   opacity:1;
   -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 }
 
-.ultraaddons-element form.search-form input.search-field:-ms-input-placeholder,
-.ultraaddons-element form.woocommerce-product-search input.search-field:-ms-input-placeholder{
+.ua-element form.search-form input.search-field:-ms-input-placeholder,
+.ua-element form.woocommerce-product-search input.search-field:-ms-input-placeholder{
   opacity:1;
   -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 }
 
-.ultraaddons-element form.search-form input.search-field::placeholder,
-.ultraaddons-element form.woocommerce-product-search input.search-field::placeholder{
+.ua-element form.search-form input.search-field::placeholder,
+.ua-element form.woocommerce-product-search input.search-field::placeholder{
   opacity:1;
   -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 }
 
-.ultraaddons-element form.search-form input.search-submit,
-.ultraaddons-element form.woocommerce-product-search button{
+.ua-element form.search-form input.search-submit,
+.ua-element form.woocommerce-product-search button{
   /* position: absolute; */
   top: 0;
   right: 0;
@@ -58,12 +58,12 @@
   background-color: #0fc392;
   cursor: pointer;
 }
-.ultraaddons-element form.search-form input.search-submit:hover, 
-.ultraaddons-element form.woocommerce-product-search button:hover,
-.ultraaddons-element form.search-form input.search-submit:focus, 
-.ultraaddons-element form.woocommerce-product-search button:focus,
-.ultraaddons-element form.search-form input.search-submit:active, 
-.ultraaddons-element form.woocommerce-product-search button:active
+.ua-element form.search-form input.search-submit:hover, 
+.ua-element form.woocommerce-product-search button:hover,
+.ua-element form.search-form input.search-submit:focus, 
+.ua-element form.woocommerce-product-search button:focus,
+.ua-element form.search-form input.search-submit:active, 
+.ua-element form.woocommerce-product-search button:active
 {
     background-color: #0c9e77;
 }
diff --git a/inc/base/base.php b/inc/base/base.php
index db18d2ce..7ae34aea 100644
--- a/inc/base/base.php
+++ b/inc/base/base.php
@@ -187,9 +187,9 @@ public function get_keywords() {
     public function get_html_wrapper_class() {
         $wr_class = strtolower( str_replace( '_', '-', $this->get_pure_name() ) );
         $html_class = parent::get_html_wrapper_class();
-        $html_class .= ' ultraaddons-element';
+        $html_class .= ' ua-element';
         $html_class .= ' ua-element-' . $wr_class . ' ';
-        $html_class .= ' ua-' . $this->get_name() . ' ';
+        //$html_class .= ' ua-' . $this->get_name() . ' ';
         
         return rtrim( $html_class );
     }

From a827835158c7fbf686ac0635d5d9045a79299b33 Mon Sep 17 00:00:00 2001
From: Saiful Islam <codersaiful@gmail.com>
Date: Tue, 2 Mar 2021 16:06:08 +0600
Subject: [PATCH 3/9] menu issue has fixed

---
 assets/css/widgets/menu.css | 82 ++++++++++++++++++-------------------
 inc/widgets/menu.php        |  6 +--
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/assets/css/widgets/menu.css b/assets/css/widgets/menu.css
index 2feb200e..431d7d68 100644
--- a/assets/css/widgets/menu.css
+++ b/assets/css/widgets/menu.css
@@ -1,10 +1,10 @@
-.ua-element-menu ul.ua-menu {
+.ua-element-menu ul.nav-menu {
     /*display: none;*/
     list-style: none;
     margin: 0;
     padding-left: 0;
 }
-.ua-element-menu ul.ua-menu li > ul{
+.ua-element-menu ul.nav-menu li > ul{
     /*display: none;*/
     list-style: none;
 }
@@ -13,24 +13,24 @@ button.ua-menu-toggle {
     /*background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJmZWF0aGVyIGZlYXRoZXItbWVudSI+PGxpbmUgeDE9IjMiIHkxPSIxMiIgeDI9IjIxIiB5Mj0iMTIiPjwvbGluZT48bGluZSB4MT0iMyIgeTE9IjYiIHgyPSIyMSIgeTI9IjYiPjwvbGluZT48bGluZSB4MT0iMyIgeTE9IjE4IiB4Mj0iMjEiIHkyPSIxOCI+PC9saW5lPjwvc3ZnPg==);*/
     /*color: #0fc392;*/
 }
-.ua-element-menu ul.ua-menu > li {
+.ua-element-menu ul.nav-menu > li {
     position: relative;
     display: block;
 }
-.ua-element-menu ul.ua-menu li.menu-item-has-children {
+.ua-element-menu ul.nav-menu li.menu-item-has-children {
     position: relative;
     margin-right: 20px;
     padding-right: 20px;
 }
-.ua-element-menu ul.ua-menu li:after,
-.ua-element-menu ul.ua-menu li:before {
+.ua-element-menu ul.nav-menu li:after,
+.ua-element-menu ul.nav-menu li:before {
     content: "";
     display: block;
     clear: both;
 }
-.ua-element-menu ul.ua-menu > li > a,
-.ua-element-menu ul.ua-menu .focus a,
-.ua-element-menu ul.ua-menu a {
+.ua-element-menu ul.nav-menu > li > a,
+.ua-element-menu ul.nav-menu .focus a,
+.ua-element-menu ul.nav-menu a {
     color: #21272c;
     font-size: 16px;
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@@ -38,30 +38,30 @@ button.ua-menu-toggle {
     position: relative;
     padding: 10px;
 }
-.ua-element-menu ul.ua-menu li a {
+.ua-element-menu ul.nav-menu li a {
     display: block;
 }
-.ua-element-menu ul.ua-menu li::before {
+.ua-element-menu ul.nav-menu li::before {
     position: absolute;
     color: #21272c;
 }
-.ua-element-menu ul.ua-menu li.menu-item-has-children::before {
+.ua-element-menu ul.nav-menu li.menu-item-has-children::before {
     right: 5px;
     top: 34%;
 }
-.ua-element-menu ul.ua-menu .menu-item-has-children::before {
+.ua-element-menu ul.nav-menu .menu-item-has-children::before {
     content: "\f107";
     font-family: "Font Awesome 5 Free";
     font-weight: 800;
     font-style: normal;
     font-size: 20px;
 }
-/*.ua-element-menu ul.ua-menu .focus > .available-submenu::before {
+/*.ua-element-menu ul.nav-menu .focus > .available-submenu::before {
     content: "\f106";
 }*/
 
 /* Sub Menu */
-/*.ua-element-menu ul.ua-menu ul {
+/*.ua-element-menu ul.nav-menu ul {
     box-shadow: 0 3px 3px rgb(0 0 0 / 20%);
     float: left;
     position: absolute;
@@ -79,22 +79,22 @@ button.ua-menu-toggle {
 }
 @media only screen and (min-width: 991px){
     /*.menu-toggle,*/
-    .ua-element-menu ul.ua-menu {
+    .ua-element-menu ul.nav-menu {
         display: flex;
         flex-wrap: wrap;
         justify-content: center;
     }
-    .ua-element-menu ul.ua-menu > li > .available-submenu {
+    .ua-element-menu ul.nav-menu > li > .available-submenu {
         right: -4px;
         top: 31px;
     }
-    .ua-element-menu ul.ua-menu .available-submenu::before {
+    .ua-element-menu ul.nav-menu .available-submenu::before {
         font-size: 14px;
     }
-    .ua-element-menu ul.ua-menu li > ul{
+    .ua-element-menu ul.nav-menu li > ul{
         display: none;
     }
-    .ua-element-menu ul.ua-menu > li > a:before {
+    .ua-element-menu ul.nav-menu > li > a:before {
         position: absolute;
         bottom: 0;
         left: 50%;
@@ -109,26 +109,26 @@ button.ua-menu-toggle {
         transition: 0.3s;
         -webkit-transition: 0.3s;
     }
-    .ua-element-menu ul.ua-menu > li.current-menu-ancestor > a:before,
-    .ua-element-menu ul.ua-menu > li.current-menu-item >a:before,
-    .ua-element-menu ul.ua-menu > li > a:focus:before,
-    .ua-element-menu ul.ua-menu > li.focus > a:hover:before,
-    .ua-element-menu ul.ua-menu > li > a:hover:before {
+    .ua-element-menu ul.nav-menu > li.current-menu-ancestor > a:before,
+    .ua-element-menu ul.nav-menu > li.current-menu-item >a:before,
+    .ua-element-menu ul.nav-menu > li > a:focus:before,
+    .ua-element-menu ul.nav-menu > li.focus > a:hover:before,
+    .ua-element-menu ul.nav-menu > li > a:hover:before {
         width: 100%;
         visibility: visible;
         opacity: 1;
     }
-    .ua-element-menu ul.ua-menu > li > a {
+    .ua-element-menu ul.nav-menu > li > a {
         padding: 30px 10px;
     }
-    .ua-element-menu ul.ua-menu > li.current-menu-ancestor > a,
-    .ua-element-menu ul.ua-menu > li.current-menu-item > a,
-    .ua-element-menu ul.ua-menu > li > a:focus,
-    .ua-element-menu ul.ua-menu > li > a:hover {
+    .ua-element-menu ul.nav-menu > li.current-menu-ancestor > a,
+    .ua-element-menu ul.nav-menu > li.current-menu-item > a,
+    .ua-element-menu ul.nav-menu > li > a:focus,
+    .ua-element-menu ul.nav-menu > li > a:hover {
         color: #0fc392;
         outline: none;
     }
-    .ua-element-menu ul.ua-menu li.menu-item-has-children .sub-menu>li>a {
+    .ua-element-menu ul.nav-menu li.menu-item-has-children .sub-menu>li>a {
         display: inline-block;
         transition: 0.3s;
         font-weight: 500;
@@ -144,11 +144,11 @@ button.ua-menu-toggle {
         transition: 0.3s;
         -webkit-transition: 0.3s;
     }
-    .ua-element-menu ul.ua-menu li:active .sub-menu,
-    .ua-element-menu ul.ua-menu li:hover .sub-menu,
-    .ua-element-menu ul.ua-menu li:focus .sub-menu,
-    .ua-element-menu ul.ua-menu li.menu-item-has-children.focus>ul.sub-menu,
-    .ua-element-menu ul.ua-menu li.focus .sub-menu {
+    .ua-element-menu ul.nav-menu li:active .sub-menu,
+    .ua-element-menu ul.nav-menu li:hover .sub-menu,
+    .ua-element-menu ul.nav-menu li:focus .sub-menu,
+    .ua-element-menu ul.nav-menu li.menu-item-has-children.focus>ul.sub-menu,
+    .ua-element-menu ul.nav-menu li.focus .sub-menu {
         display: block;
         position: absolute;
         text-align: left;
@@ -162,18 +162,18 @@ button.ua-menu-toggle {
         border-bottom-right-radius: 5px;
         flex-direction: column;
     }
-    .ua-element-menu ul.ua-menu li:hover .sub-menu .sub-menu {
+    .ua-element-menu ul.nav-menu li:hover .sub-menu .sub-menu {
         display: none;
     }
-    .ua-element-menu ul.ua-menu li.menu-item-has-children:hover>.sub-menu,
-    .ua-element-menu ul.ua-menu li.menu-item-has-children:focus>.sub-menu,
-    .ua-element-menu ul.ua-menu li.menu-item-has-children:active>.sub-menu {
+    .ua-element-menu ul.nav-menu li.menu-item-has-children:hover>.sub-menu,
+    .ua-element-menu ul.nav-menu li.menu-item-has-children:focus>.sub-menu,
+    .ua-element-menu ul.nav-menu li.menu-item-has-children:active>.sub-menu {
         transition-delay: 0s;
         visibility: visible;
         opacity: 1;
         display: block;
     }
-    .ua-element-menu ul.ua-menu li.menu-item-has-children .sub-menu li.menu-item-has-children .sub-menu {
+    .ua-element-menu ul.nav-menu li.menu-item-has-children .sub-menu li.menu-item-has-children .sub-menu {
         top: 0;
         left: 100%;
     }
diff --git a/inc/widgets/menu.php b/inc/widgets/menu.php
index 50596756..efbcf080 100644
--- a/inc/widgets/menu.php
+++ b/inc/widgets/menu.php
@@ -82,7 +82,7 @@ protected function render() {
         }
         $wrapper_id = 'ultraaddons-navigation-' . $this->get_id();
         $this->add_render_attribute( 'wrapper', 'class', [
-            'ultraaddons-navigation-wrapper',
+            'main-navigation',
             'ultraaddons-navigation',
             $wrapper_id,
         ] );
@@ -92,10 +92,10 @@ protected function render() {
         $args = array(
 		'menu'                 => $menu_id,
 		'container'            => 'div',
-		'container_class'      => 'ua-menu-wrapper',
+		'container_class'      => 'menu',
 		'container_id'         => '',
 		'container_aria_label' => '',
-		'menu_class'           => 'ua-menu',
+		//'menu_class'           => '',
 		'menu_id'              => '',
 		'echo'                 => false,
 		'fallback_cb'          => '__return_empty_string',//'wp_page_menu',

From b3ec4174d32d3d4952bbcfc876530cd298e36546 Mon Sep 17 00:00:00 2001
From: Saiful Islam <codersaiful@gmail.com>
Date: Tue, 2 Mar 2021 16:39:21 +0600
Subject: [PATCH 4/9] menu issue has fixed

---
 assets/css/widgets/menu.css | 83 +++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/assets/css/widgets/menu.css b/assets/css/widgets/menu.css
index 431d7d68..38783f17 100644
--- a/assets/css/widgets/menu.css
+++ b/assets/css/widgets/menu.css
@@ -1,10 +1,11 @@
-.ua-element-menu ul.nav-menu {
+ul.ua-nav-menu.nav-menu{max-height: none;visibility:visible;overflow: visible;}
+.ua-element-menu ul.ua-nav-menu {
     /*display: none;*/
     list-style: none;
     margin: 0;
     padding-left: 0;
 }
-.ua-element-menu ul.nav-menu li > ul{
+.ua-element-menu ul.ua-nav-menu li > ul{
     /*display: none;*/
     list-style: none;
 }
@@ -13,24 +14,24 @@ button.ua-menu-toggle {
     /*background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJmZWF0aGVyIGZlYXRoZXItbWVudSI+PGxpbmUgeDE9IjMiIHkxPSIxMiIgeDI9IjIxIiB5Mj0iMTIiPjwvbGluZT48bGluZSB4MT0iMyIgeTE9IjYiIHgyPSIyMSIgeTI9IjYiPjwvbGluZT48bGluZSB4MT0iMyIgeTE9IjE4IiB4Mj0iMjEiIHkyPSIxOCI+PC9saW5lPjwvc3ZnPg==);*/
     /*color: #0fc392;*/
 }
-.ua-element-menu ul.nav-menu > li {
+.ua-element-menu ul.ua-nav-menu > li {
     position: relative;
     display: block;
 }
-.ua-element-menu ul.nav-menu li.menu-item-has-children {
+.ua-element-menu ul.ua-nav-menu li.menu-item-has-children {
     position: relative;
     margin-right: 20px;
     padding-right: 20px;
 }
-.ua-element-menu ul.nav-menu li:after,
-.ua-element-menu ul.nav-menu li:before {
+.ua-element-menu ul.ua-nav-menu li:after,
+.ua-element-menu ul.ua-nav-menu li:before {
     content: "";
     display: block;
     clear: both;
 }
-.ua-element-menu ul.nav-menu > li > a,
-.ua-element-menu ul.nav-menu .focus a,
-.ua-element-menu ul.nav-menu a {
+.ua-element-menu ul.ua-nav-menu > li > a,
+.ua-element-menu ul.ua-nav-menu .focus a,
+.ua-element-menu ul.ua-nav-menu a {
     color: #21272c;
     font-size: 16px;
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@@ -38,30 +39,30 @@ button.ua-menu-toggle {
     position: relative;
     padding: 10px;
 }
-.ua-element-menu ul.nav-menu li a {
+.ua-element-menu ul.ua-nav-menu li a {
     display: block;
 }
-.ua-element-menu ul.nav-menu li::before {
+.ua-element-menu ul.ua-nav-menu li::before {
     position: absolute;
     color: #21272c;
 }
-.ua-element-menu ul.nav-menu li.menu-item-has-children::before {
+.ua-element-menu ul.ua-nav-menu li.menu-item-has-children::before {
     right: 5px;
     top: 34%;
 }
-.ua-element-menu ul.nav-menu .menu-item-has-children::before {
+.ua-element-menu ul.ua-nav-menu .menu-item-has-children::before {
     content: "\f107";
     font-family: "Font Awesome 5 Free";
     font-weight: 800;
     font-style: normal;
     font-size: 20px;
 }
-/*.ua-element-menu ul.nav-menu .focus > .available-submenu::before {
+/*.ua-element-menu ul.ua-nav-menu .focus > .available-submenu::before {
     content: "\f106";
 }*/
 
 /* Sub Menu */
-/*.ua-element-menu ul.nav-menu ul {
+/*.ua-element-menu ul.ua-nav-menu ul {
     box-shadow: 0 3px 3px rgb(0 0 0 / 20%);
     float: left;
     position: absolute;
@@ -79,22 +80,22 @@ button.ua-menu-toggle {
 }
 @media only screen and (min-width: 991px){
     /*.menu-toggle,*/
-    .ua-element-menu ul.nav-menu {
+    .ua-element-menu ul.ua-nav-menu {
         display: flex;
         flex-wrap: wrap;
         justify-content: center;
     }
-    .ua-element-menu ul.nav-menu > li > .available-submenu {
+    .ua-element-menu ul.ua-nav-menu > li > .available-submenu {
         right: -4px;
         top: 31px;
     }
-    .ua-element-menu ul.nav-menu .available-submenu::before {
+    .ua-element-menu ul.ua-nav-menu .available-submenu::before {
         font-size: 14px;
     }
-    .ua-element-menu ul.nav-menu li > ul{
+    .ua-element-menu ul.ua-nav-menu li > ul{
         display: none;
     }
-    .ua-element-menu ul.nav-menu > li > a:before {
+    .ua-element-menu ul.ua-nav-menu > li > a:before {
         position: absolute;
         bottom: 0;
         left: 50%;
@@ -109,26 +110,26 @@ button.ua-menu-toggle {
         transition: 0.3s;
         -webkit-transition: 0.3s;
     }
-    .ua-element-menu ul.nav-menu > li.current-menu-ancestor > a:before,
-    .ua-element-menu ul.nav-menu > li.current-menu-item >a:before,
-    .ua-element-menu ul.nav-menu > li > a:focus:before,
-    .ua-element-menu ul.nav-menu > li.focus > a:hover:before,
-    .ua-element-menu ul.nav-menu > li > a:hover:before {
+    .ua-element-menu ul.ua-nav-menu > li.current-menu-ancestor > a:before,
+    .ua-element-menu ul.ua-nav-menu > li.current-menu-item >a:before,
+    .ua-element-menu ul.ua-nav-menu > li > a:focus:before,
+    .ua-element-menu ul.ua-nav-menu > li.focus > a:hover:before,
+    .ua-element-menu ul.ua-nav-menu > li > a:hover:before {
         width: 100%;
         visibility: visible;
         opacity: 1;
     }
-    .ua-element-menu ul.nav-menu > li > a {
+    .ua-element-menu ul.ua-nav-menu > li > a {
         padding: 30px 10px;
     }
-    .ua-element-menu ul.nav-menu > li.current-menu-ancestor > a,
-    .ua-element-menu ul.nav-menu > li.current-menu-item > a,
-    .ua-element-menu ul.nav-menu > li > a:focus,
-    .ua-element-menu ul.nav-menu > li > a:hover {
+    .ua-element-menu ul.ua-nav-menu > li.current-menu-ancestor > a,
+    .ua-element-menu ul.ua-nav-menu > li.current-menu-item > a,
+    .ua-element-menu ul.ua-nav-menu > li > a:focus,
+    .ua-element-menu ul.ua-nav-menu > li > a:hover {
         color: #0fc392;
         outline: none;
     }
-    .ua-element-menu ul.nav-menu li.menu-item-has-children .sub-menu>li>a {
+    .ua-element-menu ul.ua-nav-menu li.menu-item-has-children .sub-menu>li>a {
         display: inline-block;
         transition: 0.3s;
         font-weight: 500;
@@ -144,11 +145,11 @@ button.ua-menu-toggle {
         transition: 0.3s;
         -webkit-transition: 0.3s;
     }
-    .ua-element-menu ul.nav-menu li:active .sub-menu,
-    .ua-element-menu ul.nav-menu li:hover .sub-menu,
-    .ua-element-menu ul.nav-menu li:focus .sub-menu,
-    .ua-element-menu ul.nav-menu li.menu-item-has-children.focus>ul.sub-menu,
-    .ua-element-menu ul.nav-menu li.focus .sub-menu {
+    .ua-element-menu ul.ua-nav-menu li:active .sub-menu,
+    .ua-element-menu ul.ua-nav-menu li:hover .sub-menu,
+    .ua-element-menu ul.ua-nav-menu li:focus .sub-menu,
+    .ua-element-menu ul.ua-nav-menu li.menu-item-has-children.focus>ul.sub-menu,
+    .ua-element-menu ul.ua-nav-menu li.focus .sub-menu {
         display: block;
         position: absolute;
         text-align: left;
@@ -162,18 +163,18 @@ button.ua-menu-toggle {
         border-bottom-right-radius: 5px;
         flex-direction: column;
     }
-    .ua-element-menu ul.nav-menu li:hover .sub-menu .sub-menu {
+    .ua-element-menu ul.ua-nav-menu li:hover .sub-menu .sub-menu {
         display: none;
     }
-    .ua-element-menu ul.nav-menu li.menu-item-has-children:hover>.sub-menu,
-    .ua-element-menu ul.nav-menu li.menu-item-has-children:focus>.sub-menu,
-    .ua-element-menu ul.nav-menu li.menu-item-has-children:active>.sub-menu {
+    .ua-element-menu ul.ua-nav-menu li.menu-item-has-children:hover>.sub-menu,
+    .ua-element-menu ul.ua-nav-menu li.menu-item-has-children:focus>.sub-menu,
+    .ua-element-menu ul.ua-nav-menu li.menu-item-has-children:active>.sub-menu {
         transition-delay: 0s;
         visibility: visible;
         opacity: 1;
         display: block;
     }
-    .ua-element-menu ul.nav-menu li.menu-item-has-children .sub-menu li.menu-item-has-children .sub-menu {
+    .ua-element-menu ul.ua-nav-menu li.menu-item-has-children .sub-menu li.menu-item-has-children .sub-menu {
         top: 0;
         left: 100%;
     }

From e00023e5de91ae5a01329e840a179167140d409c Mon Sep 17 00:00:00 2001
From: Saiful Islam <codersaiful@gmail.com>
Date: Tue, 2 Mar 2021 16:39:58 +0600
Subject: [PATCH 5/9] menu issue has fixed

---
 inc/widgets/menu.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/inc/widgets/menu.php b/inc/widgets/menu.php
index efbcf080..1a1b423a 100644
--- a/inc/widgets/menu.php
+++ b/inc/widgets/menu.php
@@ -80,10 +80,9 @@ protected function render() {
             echo wp_kses_post( '<h2 class="hidden_text">' . __( 'There is no menu available. Please create First' ) . '</h2>' );
             return;
         }
-        $wrapper_id = 'ultraaddons-navigation-' . $this->get_id();
+        $wrapper_id = 'ua-navigation-' . $this->get_id();
         $this->add_render_attribute( 'wrapper', 'class', [
-            'main-navigation',
-            'ultraaddons-navigation',
+            'ua-navigation',
             $wrapper_id,
         ] );
         $this->add_render_attribute( 'wrapper', 'id', $wrapper_id );
@@ -92,10 +91,10 @@ protected function render() {
         $args = array(
 		'menu'                 => $menu_id,
 		'container'            => 'div',
-		'container_class'      => 'menu',
+		'container_class'      => 'ua-menu-container',
 		'container_id'         => '',
 		'container_aria_label' => '',
-		//'menu_class'           => '',
+		'menu_class'           => 'ua-nav-menu',
 		'menu_id'              => '',
 		'echo'                 => false,
 		'fallback_cb'          => '__return_empty_string',//'wp_page_menu',
@@ -120,12 +119,12 @@ protected function render() {
                 $this->add_render_attribute( 'i', 'class', $settings['add_icon'] );
                 $this->add_render_attribute( 'i', 'aria-hidden', 'true' );
         }
-        $svg        = !empty( $settings['add_add_icon']['value']['url'] ) && is_string( $settings['add_add_icon']['value']['url'] ) ? $settings['add_add_icon']['value']['url'] : false;
+        $svg        = !empty( $settings['add_icon']['value']['url'] ) && is_string( $settings['add_icon']['value']['url'] ) ? $settings['add_icon']['value']['url'] : false;
 
         ?>
         <nav <?php echo $this->get_render_attribute_string( 'wrapper' ); ?>>
             <div class="ua-nav-inside">
-                <button class="ua-menu-toggle" aria-controls="primary-menu" aria-expanded="false">
+                <button class="ua-menu-toggle" aria-controls="<?php echo esc_attr( $wrapper_id ); ?>" aria-expanded="false">
                     <?php if( $svg ){ ?>
                     <img class="ua-menu-icon-svg" src="<?php echo esc_url( $svg ); ?>">
                     <?php }elseif( $has_icon ){ ?>

From ebda5763e6274c555c62318a8d76e50d62af7157 Mon Sep 17 00:00:00 2001
From: codeastrology-dev <codeastrology.dev2@gmail.com>
Date: Tue, 2 Mar 2021 16:47:49 +0600
Subject: [PATCH 6/9] working on menu #012

---
 assets/css/widgets/menu.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/widgets/menu.css b/assets/css/widgets/menu.css
index 38783f17..9ac1811b 100644
--- a/assets/css/widgets/menu.css
+++ b/assets/css/widgets/menu.css
@@ -37,7 +37,7 @@ button.ua-menu-toggle {
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     font-weight: 500;
     position: relative;
-    padding: 10px;
+    /*padding: 10px;*/
 }
 .ua-element-menu ul.ua-nav-menu li a {
     display: block;

From ccca7bc675dd290ccccd8531e9ca789b29fbc9de Mon Sep 17 00:00:00 2001
From: Saiful Islam <codersaiful@gmail.com>
Date: Tue, 2 Mar 2021 17:40:28 +0600
Subject: [PATCH 7/9] widget showing in basic or general category feature added

---
 inc/base/base.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/inc/base/base.php b/inc/base/base.php
index 7ae34aea..7954b543 100644
--- a/inc/base/base.php
+++ b/inc/base/base.php
@@ -3,6 +3,7 @@
 
 use Elementor\Widget_Base;
 use UltraAddons\Core\Widgets_Manager;
+use UltraAddons\Core\Settings;
 
 defined( 'ABSPATH' ) || die();
 
@@ -136,6 +137,17 @@ public function get_categories() {
          */
         $widget_category = apply_filters( 'ultraaddons_widget_category', $default, $this );
 
+        /**
+         * Widget showing in Desired Category
+         * it will come from database
+         * which is sroted from Setting page of UltraAddons
+         * 
+         * @since 1.0.2.1
+         */
+        if( Settings::get_widget_category() && is_array( $widget_category ) ){
+            array_push( $widget_category, Settings::get_widget_category() );
+        }
+
         //Check if null or array
         if( empty( $widget_category ) || ! is_array( $widget_category ) ){
             $widget_category = $default;

From 5b21b347aa6f9812c8f9124f8d2b47b4f71bdb43 Mon Sep 17 00:00:00 2001
From: Saiful Islam <codersaiful@gmail.com>
Date: Tue, 2 Mar 2021 17:41:08 +0600
Subject: [PATCH 8/9] widget showing in basic or general category feature
 working

---
 admin/admin-handle.php   | 22 +++++++++++
 admin/pages/settings.php | 68 ++++++++++++++++++++++++++++++++
 inc/core/settings.php    | 84 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 174 insertions(+)
 create mode 100644 admin/pages/settings.php
 create mode 100644 inc/core/settings.php

diff --git a/admin/admin-handle.php b/admin/admin-handle.php
index abbac7e6..f377e478 100644
--- a/admin/admin-handle.php
+++ b/admin/admin-handle.php
@@ -189,6 +189,17 @@ public static function get_submenu(){
                 'position'      =>  2,
             ],
             
+            [
+                'parent_slug'   => self::$menu_slug,//$parent_slug,
+                'page_title'    =>  __( 'Settings for UltraAddons', 'ultraaddons' ),
+                'menu_title'    =>  __( 'Settings', 'ultraaddons' ),
+                'capability'    => self::$capability,
+                'menu_slug'     => 'ultraaddons-elementor-settings',
+                'function'      => [__CLASS__, 'settings_page'],
+                'position'      =>  9992,
+            ],
+            
+            
         ];
         
         self::$sub_menu = apply_filters( 'ultraaddons/admin/sub_menu', self::$sub_menu );
@@ -246,6 +257,17 @@ public static function header_footer_page() {
         include_once self::$footer_file;
     }
     
+    /**
+     * Opening Header Footer for User.
+     */
+    public static function settings_page() {
+        include_once self::$header_file;
+        
+        include ULTRA_ADDONS_DIR . 'admin/pages/settings.php';
+        
+        include_once self::$footer_file;
+    }
+    
     
 }
 Admin_Handle::init();
\ No newline at end of file
diff --git a/admin/pages/settings.php b/admin/pages/settings.php
new file mode 100644
index 00000000..01bae838
--- /dev/null
+++ b/admin/pages/settings.php
@@ -0,0 +1,68 @@
+<?php
+
+use UltraAddons\Core\Settings;
+
+defined( 'ABSPATH' ) || die();
+
+/**
+ * Controlling Form Submission
+ */
+$form_datas = filter_input_array(INPUT_POST);
+
+do_action( 'ultraaddons_save_data', $form_datas, 'settings' );
+
+$key = Settings::$key;
+
+if( $form_datas && $key ){
+    update_option( $key, $form_datas );
+}
+$current_data = Settings::get_data();
+
+
+$category_slug = Settings::get_widget_category();
+?>
+
+<div class="ultraaddons-section ua-option-wrapper">
+    <div class="ua-section-inside">
+        <div class="ua-header">
+            <h1 class="ua-page-title"><?php echo esc_html__( 'Settings', 'ultraaddons' ); ?></h1>
+        </div>
+        
+        <div class="ua-sectioon-content">
+            <div class="ua-content-inside">
+
+                <form class="ua-header-footer-form" action="" method="post">
+                    <div class="ua-form-wrappper">
+                    
+                        
+                    
+
+
+                    <div class="ultraaddons-field-container field-container-category">
+                        <label class="field-label field-label-header-choose"><?php echo esc_html__( 'Widget Showing in', 'ultraaddons' ); ?></label>    
+                        <select class="ultraddons-select" name="widget_in">
+                            <option value="" ><?php echo esc_html__( 'Only UltraAddons', 'ultraaddons' ); ?></option>
+                            <option value="basic" <?php echo $category_slug == 'basic' ? 'selected' : ''; ?>><?php echo esc_html__( 'Basic', 'ultraaddons' ); ?></option>
+                            <option value="general" <?php echo $category_slug == 'general' ? 'selected' : ''; ?>><?php echo esc_html__( 'General', 'ultraaddons' ); ?></option>
+                            
+                        </select>
+                        <div class="ua-form-message">
+                            <p>
+                                Widget shows in <b>Addons - UltraAddons</b> Category of Elementor(in Elementor Edit Screen). If you want to show UltraAddons Widget
+                                    in Basic or General category, Choose and Save Change.
+                            </p>
+                        </div>
+                    </div>
+
+                     
+
+                    </div> <!-- /.ua-form-wrappper -->
+                    <div class="ua-widget-footer">
+                        <button class="primary button button-primary ua-primary ua-no-update" type="submit"><?php echo esc_html__( 'Save Change', 'ultraaddons' ); ?></button>
+                    </div>
+                </form>
+                
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/inc/core/settings.php b/inc/core/settings.php
new file mode 100644
index 00000000..f0f8e77c
--- /dev/null
+++ b/inc/core/settings.php
@@ -0,0 +1,84 @@
+<?php
+namespace UltraAddons\Core;
+
+defined( 'ABSPATH' ) || die();
+
+/**
+ * Control of Settings
+ * Actually we need can some setting for Our Plugin.
+ * So we will use this function to Control of Setting from Admin Panel
+ * 
+ * Primarily we will use to save setting, where will show widget.
+ * In Basic Category of Elementor or 
+ * UltraAddons Category 
+ *
+ * @author Saiful
+ * @since 1.0.2.1
+ * @date 3.2.2021
+ */
+class Settings {
+    
+    /**
+     * key for update and get data from database.
+     *
+     * @var string option key for update and get data from database. 
+     */
+    public static $key = 'ultraaddons_settings';
+    
+    /**
+     * Default data for header id, and footer id.
+     *
+     * @var Array 
+     */
+    public static $data = [
+        'widget_in' => '',//basic,general
+    ];
+
+    
+    
+    /**
+     * Getting settings data from
+     * database
+     * I have taken data based on sell:$key which is 'ultraaddons_settings'
+     * Actually if not found any data in database, based on this key
+     * then it will return default data from property
+     * 
+     * @Hook Available hook is ultraaddons/header_footer/data. can be call from pro version.
+     * 
+     * @return array|null
+     */
+    public static function get_data() {
+        /**
+         * if not found data based on key, then it will return default 
+         * data from property
+         * 
+         * @since 1.0.1.0
+         */
+        $data = get_option( self::$key, self::$data );
+        return apply_filters( 'ultraaddons/settings/data', $data );
+    }
+    
+    /**
+     * Retrieve category name for widget, which is saved in database,
+     * and store from Setting page of UltraAddons
+     * 
+     * Elementor Widget's category name slug. Mainly used in Base/Base() and in setting page in admin. Obviously should be String.
+     * 
+     * *************************
+     * Explanation
+     * *************************
+     * Sometime user 
+     * want to show widget in Elementor Basic Category
+     * Even can want to show in General Category
+     * 
+     * @return String Elementor Widget's category name slug. Mainly used in Base/Base() and in setting page in admin. Obviously should be String.
+     */
+    public static function get_widget_category() {
+
+        $data = self::get_data();
+        if( isset( $data['widget_in'] ) && ! empty( $data['widget_in'] ) ){
+            return $data['widget_in'];
+        }
+        return;
+    }
+}

From 13c69f291bf7eafc8d370c8b85188e10830b870b Mon Sep 17 00:00:00 2001
From: Saiful Islam <codersaiful@gmail.com>
Date: Tue, 2 Mar 2021 17:43:08 +0600
Subject: [PATCH 9/9] selected issue fix for select tag

---
 admin/pages/header-footer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/pages/header-footer.php b/admin/pages/header-footer.php
index ef410696..8d07cff4 100644
--- a/admin/pages/header-footer.php
+++ b/admin/pages/header-footer.php
@@ -140,8 +140,8 @@
                         <div class="ultraaddons-field-container field-container-size">
                             <label class="field-label field-label-header-choose"><?php echo esc_html__( 'Container Size', 'ultraaddons' ); ?></label>    
                             <select class="ultraddons-select" name="wrapper">
-                                <option value="box" selected="<?php echo $wrapper == 'box' ? 'selected' : ''; ?>"><?php echo esc_html__( 'Box', 'ultraaddons' ); ?></option>
-                                <option value="flued" selected="<?php echo $wrapper == 'Flued' ? 'selected' : ''; ?>"><?php echo esc_html__( 'Flued', 'ultraaddons' ); ?></option>
+                                <option value="box" <?php echo $wrapper == 'box' ? 'selected' : ''; ?>><?php echo esc_html__( 'Box', 'ultraaddons' ); ?></option>
+                                <option value="flued" <?php echo $wrapper == 'flued' ? 'selected' : ''; ?>><?php echo esc_html__( 'Flued', 'ultraaddons' ); ?></option>
                                 
                             </select>
                             <div class="ua-form-message">