refactor: update navbar

TGRHavoc · TGRHavoc · commit 10df12bcce92 · 2019-05-17T17:27:05.000+01:00
Navbar now has stuff in it... Well, it _will_ do when I add them.
diff --git a/index.php b/index.php
@@ -148,20 +148,24 @@
 </head>
 <body>
 
-	<nav class="navbar navbar-default-invert navbar-static-top" style="margin: 0;">
+	<nav class="navbar navbar-dark navbar-expand-md">
 		<!-- At some point, I'll add more stuff here. For the time being, it'll just be the site logo -->
-		<div class="container-fluid">
-			<div class="container">
-				<div class="navbar-brand" style="padding: 10px 15px">
-					<!-- You can change this shit -->
-					<a href="https://github.com/TGRHavoc/">
-						<img src="https://avatars1.githubusercontent.com/u/1770893?s=460&v=4" style="max-height: 30px" >
-						Live Map
-					</a>
-				</div>
-
+		<div class="container">
+			<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+			<a class="navbar-brand" href="https://github.com/TGRHavoc/">
+					<img src="https://avatars1.githubusercontent.com/u/1770893?s=460&v=4" style="max-height: 30px" >
+					Live Map
+			</a>
+			
+			<div class="collapse navbar-collapse" id="navbarNav">
+				<ul class="navbar-nav">
+					<!-- TODO: Dynamically generate links? -->
+				</ul>
 			</div>
 		</div>
+
 	</nav>
 
 	<div id="wrapper" class="container-fluid">
diff --git a/js/src/map.js b/js/src/map.js
@@ -97,6 +97,7 @@ var mapRoadOptions = {
     },
     tileSize: new google.maps.Size(256, 256),
     maxZoom: 7,
+    minZoom: 5,
     name: "Road",
     alt: "GTA V Road Map"
 };
diff --git a/style/src/style.css b/style/src/style.css
@@ -134,6 +134,40 @@ input[type=text] {display:inline;}
 /* UI/Overides --------------------- */
 #cookieChoiceInfo { background-color: #333!important; }
 
+/*************
+    Alerts
+*************/
+.alert {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+  color: #fff;
+}
+.alert-success {
+    border-color: #19B99A;
+    background: #20A286;
+}
+.alert-info {
+    border-color: #B4E1E4;
+    background: #81c7e1;
+}
+.alert-warning {
+    border-color: #bd6900;
+    background: #ff8e00;
+}
+.alert-danger {
+    border-color: #B63E5A;
+    background: #E26868;
+}
+.alert-alt {
+    border-color: #694D9F;
+    background: #694D9F;
+}
+
+
+/**********************
+    Sidebar
+***********************/
 .nav-header {
     font-size: 25px;
     text-align: center;
diff --git a/utils/minifier.php b/utils/minifier.php
@@ -70,9 +70,8 @@ private static function minifyJS($files) {
     }
 
     public static function printCss($debug){
-        $cssFiles = array("style/src/bootstrap.css", "style/src/bootstrap-grid.css", "style/src/bootstrap-grid.css",
-                            "style/src/bootstrap-theme.css",
-                            "style/src/style.css");
+        $cssFiles = array("style/src/bootstrap.css", "style/src/bootstrap-grid.css",
+             "style/src/bootstrap-grid.css", "style/src/style.css");
         if($debug){
             foreach($cssFiles as $fname){
                 echo "<link type=\"text/css\" rel=\"stylesheet\" href=\"$fname\">";
