Fix justify megamenu alignment

t3framework · Jan 6, 2014 · c5a761c · c5a761c
1 parent 1b9514e
commit c5a761c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/source/plg_system_t3/base-bs3/js/menu.js b/source/plg_system_t3/base-bs3/js/menu.js
@@ -78,6 +78,10 @@
 						align_delta = 0,
 						align_trans = 0;
 
+					if(align == 'justify'){
+						return;	//do nothing
+					}
+
 					if(!align){
 						align = 'left';
 					}

diff --git a/source/plg_system_t3/base/js/menu.js b/source/plg_system_t3/base/js/menu.js
@@ -78,6 +78,10 @@
 						align_delta = 0,
 						align_trans = 0;
 
+					if(align == 'justify'){
+						return;	//do nothing
+					}
+
 					if(!align){
 						align = 'left';
 					}

diff --git a/source/plg_system_t3/includes/menu/megamenu.tpl.php b/source/plg_system_t3/includes/menu/megamenu.tpl.php
@@ -65,7 +65,7 @@ static function beginmega($vars)
 		$data    = '';
 		if (isset($setting['class'])) $data .= " data-class=\"{$setting['class']}\"";
 		if (isset($setting['alignsub']) && $setting['alignsub'] == 'justify') {
-			$cls .= " span12";
+			$cls  .= ' ' . ($vars['menu']->editmode ? 'span' : T3_BASE_NONRSP_WIDTH_PREFIX) . '12';
 		} else {
 			if (isset($sub['width'])) {
 				if ($item->dropdown) $style = ' style="width: ' . str_replace('px', '', $sub['width']) . 'px"';