Merge remote-tracking branch 'origin/master'

# Conflicts:
#	wp-content/mu-plugins/cube/Widgets/BannerText.php
#	wp-content/themes/miranui_new/resources/css/common.scss
#	wp-content/themes/miranui_new/resources/css/header.scss
#	wp-content/themes/miranui_new/resources/css/variables.scss

diff --cc wp-content/mu-plugins/cube/Widgets/BannerText.php
index 2774b857bcae243cac2200ca55d4ce49173e44e7,b2000c5ea6890225d15b1b910014aeba780a66c7..0fc87d813eeb99f083ef207295835ab19c14325e
--- 1/wp-content/mu-plugins/cube/Widgets/BannerText.php
--- 2/wp-content/mu-plugins/cube/Widgets/BannerText.php
+++ b/wp-content/mu-plugins/cube/Widgets/BannerText.php
@@@ -88,44 -87,44 +88,85 @@@ class BannerText extends _Base 
          $attributes = $this->get_render_attributes();
  
          // Rendered content
++<<<<<<< HEAD
 +        echo view("widgets/bannerText", compact("settings", "attributes"));
 +    }
 +
 +    protected function backboneTemplate(){ ?>
 +      <#
 +      size_classes = {
 +      'xlarge': 'text-xl',
 +      'large': 'text-lg',
 +      };
 +
 +      view.addRenderAttribute(
 +      'title',
 +      {
 +      'class': [ 'text-block-title font-bold text-xl', size_classes[settings.text_size] ]
 +      }
 +      );
 +      view.addRenderAttribute( 'subtitle', 'class', ['text-block-subtitle font-bold text-md']);
 +      view.addRenderAttribute( 'body', 'class', ['text-block-body']);
 +
 +      view.addInlineEditingAttributes( 'title', 'none' );
 +      view.addInlineEditingAttributes( 'subtitle', 'none' );
 +      view.addInlineEditingAttributes( 'body', 'none' );
 +      #>
 +      <div class="text-block">
 +
 +        <# if ('' !== settings.title) { #>
 +        <{{{ settings.title_tag }}} {{{ view.getRenderAttributeString( 'title' ) }}}>{{{ settings.title }}}</{{{ settings.title_tag }}}>
 +      <# } #>
 +
 +      <# if ('' !== settings.subtitle) { #>
 +      <{{{ settings.subtitle_tag }}} {{{ view.getRenderAttributeString( 'subtitle' ) }}}>{{{ settings.subtitle }}}</{{{ settings.subtitle_tag }}}>
 +      <# } #>
 +
 +      <# if ('' !== settings.body) { #>
 +      <div {{{ view.getRenderAttributeString( 'body' ) }}}>{{{ settings.body }}}</div>
 +      <# } #>
 +
 +      </div>
++=======
+         echo view("widgets/banner", compact("settings", "attributes"));
+     }
+ 
+     protected function backboneTemplate(){ ?>
+         <#
+         size_classes = {
+             'xlarge': 'text-xl',
+             'large': 'text-lg',
+         };
+ 
+         view.addRenderAttribute(
+             'title',
+             {
+                 'class': [ 'text-block-title font-bold text-xl', size_classes[settings.text_size] ]
+             }
+         );
+         view.addRenderAttribute( 'subtitle', 'class', ['text-block-subtitle font-bold text-md']);
+         view.addRenderAttribute( 'body', 'class', ['text-block-body']);
+ 
+         view.addInlineEditingAttributes( 'title', 'none' );
+         view.addInlineEditingAttributes( 'subtitle', 'none' );
+         view.addInlineEditingAttributes( 'body', 'none' );
+         #>
+         <div class="text-block">
+ 
+         <# if ('' !== settings.title) { #>
+         <{{{ settings.title_tag }}} {{{ view.getRenderAttributeString( 'title' ) }}}>{{{ settings.title }}}</{{{ settings.title_tag }}}>
+         <# } #>
+ 
+         <# if ('' !== settings.subtitle) { #>
+         <{{{ settings.subtitle_tag }}} {{{ view.getRenderAttributeString( 'subtitle' ) }}}>{{{ settings.subtitle }}}</{{{ settings.subtitle_tag }}}>
+         <# } #>
+ 
+         <# if ('' !== settings.body) { #>
+         <div {{{ view.getRenderAttributeString( 'body' ) }}}>{{{ settings.body }}}</div>
+         <# } #>
+ 
+         </div>
++>>>>>>> origin/master
      <?php }
  
      /**