conflict fix

JoomShaper · May 19, 2023 · 3e51c35 · 3e51c35
2 parents 6ec5b19 + 5b298b9
commit 3e51c35
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/plugins/system/helixultimate/overrides/com_finder/search/default.php b/plugins/system/helixultimate/overrides/com_finder/search/default.php
@@ -34,7 +34,7 @@
 <div class="finder">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<h1>
-			<?php if ($this ->escape($this->params->get('page_heading'))) : ?>
+			<?php if ($this->escape($this->params->get('page_heading'))) : ?>
 				<?php echo $this->escape($this->params->get('page_heading')); ?>
 			<?php else : ?>
 				<?php echo $this->escape($this->params->get('page_title')); ?>

diff --git a/plugins/system/helixultimate/overrides/layouts/joomla/content/readmore.php b/plugins/system/helixultimate/overrides/layouts/joomla/content/readmore.php
@@ -36,8 +36,7 @@
 		</a>
 	<?php else : ?>
 		<a href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo Text::_('COM_CONTENT_READ_MORE'); ?> <?php echo htmlspecialchars($item->title ?? "", ENT_QUOTES, 'UTF-8'); ?>">
-			<?php echo Text::_('COM_CONTENT_READ_MORE'); ?>
-			<?php echo HTMLHelper::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+			<?php echo Text::sprintf('JGLOBAL_READ_MORE_TITLE', HTMLHelper::_('string.truncate', $item->title, $params->get('readmore_limit'))); ?>
 		</a>
 	<?php endif; ?>
 </div>
diff --git a/plugins/system/helixultimate/src/Core/HelixUltimate.php b/plugins/system/helixultimate/src/Core/HelixUltimate.php
@@ -1897,10 +1897,10 @@ public function getSCSSVariables() : array
 				'footer_link_hover_color' => $this->params->get('footer_link_hover_color'),
 				'topbar_bg_color' => $this->params->get('topbar_bg_color'),
 				'topbar_text_color' => $this->params->get('topbar_text_color'),
-				'offcanvas_menu_icon_color' => $this->params->get('offcanvas_menu_icon_color'),
-				'offcanvas_menu_bg_color' => $this->params->get('offcanvas_menu_bg_color'),
-				'offcanvas_menu_items_and_items_color' => $this->params->get('offcanvas_menu_items_and_items_color'),
-				'offcanvas_menu_active_menu_item_color' => $this->params->get('offcanvas_menu_active_menu_item_color')
+				'offcanvas_menu_icon_color' => $this->params->get('offcanvas_menu_icon_color') ?? '#000000',
+				'offcanvas_menu_bg_color' => $this->params->get('offcanvas_menu_bg_color') ?? $this->params->get('menu_dropdown_bg_color'),
+				'offcanvas_menu_items_and_items_color' => $this->params->get('offcanvas_menu_items_and_items_color') ?? $this->params->get('menu_dropdown_text_color'),
+				'offcanvas_menu_active_menu_item_color' => $this->params->get('offcanvas_menu_active_menu_item_color') ?? $scssVars['menu_text_active_color']
 			);
 		}
 		else

diff --git a/templates/shaper_helixultimate/options.xml b/templates/shaper_helixultimate/options.xml
@@ -1871,7 +1871,7 @@
 			type="text" 
 			label="HELIX_ULTIMATE_GOOGLE_ANALYTICS_CODE" 
 			description="HELIX_ULTIMATE_GOOGLE_ANALYTICS_CODE_DESC" 
-			hint="UA-xxxxxxxxx-x" />
+			hint="G-XXXXXXXXXX" />
 		<field name="ga_tracking_method" 
 			helixgroup="analytics" 
 			type="list" 

diff --git a/templates/shaper_helixultimate/scss/theme.scss b/templates/shaper_helixultimate/scss/theme.scss
@@ -801,14 +801,21 @@ body.modal-menu-active {
     background: #fff;
     border: 1px solid #e4e4e4;
     border-radius: 3px;
-    padding: 10px 15px !important;
+    padding: 10px 5px !important;
     list-style: none !important;
     font-size: 14px;
     position: absolute;
     min-width: 100px;
     right: 0;
     top: 100%;
     display: none !important;
+    li {
+      a {
+        display: block;
+        width: 100%;
+        padding: 0 15px;
+      }
+    }
     > li:not(:last-child) {
       border-bottom: 1px solid #e4e4e4;
       padding-bottom: 5px;
@@ -2593,4 +2600,16 @@ body.contentpane.com-contact.view-contacts.layout-modal {
   img {
     width: 100%;
   }
+}
+
+.visually-hidden, .visually-hidden-focusable:not(:focus):not(:focus-within) {
+  position: absolute !important;
+  width: 1px !important;
+  height: 1px !important;
+  padding: 0 !important;
+  margin: -1px !important;
+  overflow: hidden !important;
+  clip: rect(0,0,0,0) !important;
+  white-space: nowrap !important;
+  border: 0 !important;
 }