fix navbar on mobile

greenelfx · Apr 27, 2019 · 990bd31 · 990bd31
1 parent b5a962c
commit 990bd31
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git a/assets/css/dark.css b/assets/css/dark.css
diff --git a/assets/css/light.css b/assets/css/light.css
diff --git a/assets/js/bootstrap.min.js b/assets/js/bootstrap.min.js
diff --git a/sources/admin/main.php b/sources/admin/main.php
@@ -20,7 +20,7 @@
 				$current_tags = file_get_contents("https://api.github.com/repos/greenelfx/maplebit/tags", false, $context);
 				if ($current_tags) {
 					$tags = json_decode($current_tags);
-					$ref_tag = "v1.18";
+					$ref_tag = "v1.19";
 					$current_tag = $tags[0]->name;
 					if ($current_tag == $ref_tag) {
 						$alert_class = "success";

diff --git a/sources/structure/footer.php b/sources/structure/footer.php
@@ -13,7 +13,7 @@
 				</div>
 			</footer>
 		</div>
-		<script type="text/javascript" src="<?php echo $siteurl; ?>assets/js/bootstrap.min.js"></script>
+		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 		<script type="text/javascript" src="<?php echo $siteurl; ?>assets/js/login.js"></script>
 		<script type="text/javascript">
 			function roll(img_name1, img_src1) {document.getElementById(img_name1).src = img_src1;}

diff --git a/sources/structure/header.php b/sources/structure/header.php
@@ -12,7 +12,6 @@
 		<link rel="icon" href="favicon.ico" type="image/x-icon" />
 		<link href="<?php echo $siteurl;?>assets/css/<?php echo $theme; ?>.min.css" rel="stylesheet" type="text/css" />
 		<link href="<?php echo $siteurl;?>assets/css/addon.css" rel="stylesheet" type="text/css" />
-		<link href="<?php echo $siteurl;?>assets/css/<?php echo $themetype; ?>.css" rel="stylesheet" type="text/css" />
 		<style type="text/css">
 			body {
 				<?php
@@ -25,7 +24,7 @@
 				?>
 			}
 		</style>
-	    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+	    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 		<script src='https://www.google.com/recaptcha/api.js'></script>
 	</head>
 	<body>
@@ -37,10 +36,10 @@
 ?>
 <nav class="<?php echo $nav;?>">
 	<a class="navbar-brand" href="#"><?php echo $servername;?></a>
-	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
 	  <span class="navbar-toggler-icon"></span>
 	</button>	
-	<div class="collapse navbar-collapse">
+	<div class="collapse navbar-collapse" id="navbarContent">
 		<ul class="navbar-nav mr-auto">
 			<li class="nav-item"><a class="nav-link" href="?base=main">Home</a></li>
 			<?php