Typography fix for initial install

Author: hiteshaggarwal

astroid/astroid-framework/framework/template.php

@@ -1072,6 +1072,28 @@ public function inspect()
                $this->params->set($typoOption, $typoParams);
             }
          }
+
+         $menuType = $this->params->get('menus_typography');
+         if (trim($menuType) == 'custom') {
+            $menu_font = $this->params->get('menu_typography_options');
+            foreach (['font_size', 'font_size_unit', 'letter_spacing', 'letter_spacing_unit', 'line_height', 'line_height_unit'] as $prop) {
+               if (!is_string($menu_font->{$prop})) {
+                  $menu_font->{$prop} = $menu_font->{$prop}->desktop;
+               }
+            }
+            $this->params->set('menu_typography_options', $menu_font);
+         }
+
+         $submenuType = $this->params->get('submenus_typography');
+         if (trim($submenuType) == 'custom') {
+            $submenu_font = $this->params->get('submenu_typography_options');
+            foreach (['font_size', 'font_size_unit', 'letter_spacing', 'letter_spacing_unit', 'line_height', 'line_height_unit'] as $prop) {
+               if (!is_string($submenu_font->{$prop})) {
+                  $submenu_font->{$prop} = $submenu_font->{$prop}->desktop;
+               }
+            }
+            $this->params->set('submenu_typography_options', $submenu_font);
+         }
       }
    }
 }

astroid/astroid-template-zero/frontend/typography.php

@@ -139,21 +139,6 @@
          }
       }
    }
-   if ((isset($menu_font->font_size) && !empty($menu_font->font_size)) && (is_object($menu_font->font_size))) {
-      $font_size_unit = isset($menu_font->font_size_unit->desktop) ? $menu_font->font_size_unit->desktop : 'em';
-      $menu_style['desktop'] .= 'font-size: ' . $menu_font->font_size->desktop . $font_size_unit . ';';
-
-      // tablet
-      $font_size_unit = isset($menu_font->font_size_unit->tablet) ? $menu_font->font_size_unit->tablet : 'em';
-      $menu_style['tablet'] .= 'font-size: ' . $menu_font->font_size->tablet . $font_size_unit . ';';
-
-      // mobile
-      $font_size_unit = isset($menu_font->font_size_unit->mobile) ? $menu_font->font_size_unit->mobile : 'em';
-      $menu_style['mobile'] .= 'font-size: ' . $menu_font->font_size->mobile . $font_size_unit . ';';
-   } else {
-      $font_size_unit = isset($menu_font->font_size_unit) ? $menu_font->font_size_unit : 'em';
-      $menu_style['desktop'] .= 'font-size: ' . $menu_font->font_size . $font_size_unit . ';';
-   }
 
    if (isset($menu_font->font_size) && !empty($menu_font->font_size)) {
       if (is_object($menu_font->font_size)) {