Resolve merge conflicts

Author: nwmac

shell/assets/styles/base/_variables.scss

@@ -1,7 +1,6 @@
 $header-font: 'Poppins', sans-serif;
 $body-font: 'Lato', arial, helvetica, sans-serif;
 $mono-font: 'Roboto Mono', monospace;
-$default-font-family: $body-font;
 
 $app-bar-collapsed-width: 70px;
 $max-width: 1440px !default;

shell/assets/styles/themes/_suse.scss

@@ -4,10 +4,10 @@
   $lighter-green-jungle: #72EEB3;
 
   $jungle-120: #008657;
+
+  --title-font-family : 'SUSE', 'Lato', sans-serif;
 
   &.theme-light {
-    --title-font-family : 'SUSE', 'Lato', sans-serif;  
-
     --primary: #{$jungle-120};
     --primary-text: #FFFFFF;
     --primary-hover: #006B46;
@@ -48,8 +48,6 @@
   }
 
   &.theme-dark {
-    --title-font-family : 'SUSE', 'Lato', sans-serif;  
-
     --link: #9BBFFD;
     --active-nav: #{$green-40};