Merge branch '4.0-dev' into 4.0_module-xtd_js

joomla · Jan 15, 2020 · acffab3 · acffab3
2 parents 535e333 + 78e51d2
commit acffab3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/administrator/templates/atum/html/layouts/chromes/body.php b/administrator/templates/atum/html/layouts/chromes/body.php
@@ -40,7 +40,7 @@
 			<?php if ($canEdit || $canChange) : ?>
 				<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; ?>
 				<div class="module-actions dropdown">
-					<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-link" id="dropdownMenuButton-<?php echo $id; ?>">
+					<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
 						<span class="fa fa-cog" aria-hidden="true"></span>
 						<span class="sr-only"><?php echo Text::sprintf('JACTION_EDIT_MODULE', $module->title); ?></span>
 					</button>

diff --git a/administrator/templates/atum/html/layouts/chromes/well.php b/administrator/templates/atum/html/layouts/chromes/well.php
@@ -52,7 +52,7 @@
 					<?php if ($canEdit || $canChange) : ?>
 						<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; ?>
 						<div class="module-actions dropdown">
-							<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-link" id="dropdownMenuButton-<?php echo $id; ?>">
+							<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
 								<span class="fa fa-cog" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::sprintf('JACTION_EDIT_MODULE', $module->title); ?></span>
 							</button>

diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json
@@ -55,7 +55,6 @@
       "type": "preset",
       "dependencies": [
         "core#script",
-        "bootstrap.js.bundle#script",
         "css-vars-ponyfill#script",
         "focus-visible#script",
         "template.atum#script"

diff --git a/templates/cassiopeia/joomla.asset.json b/templates/cassiopeia/joomla.asset.json
@@ -50,7 +50,6 @@
       "uri": "template.js",
       "dependencies": [
         "core",
-        "jquery",
         "bootstrap.js.bundle"
       ]
     },