Fixed issue with navbar not expanding on smaller devices

kjetilhau · Nov 21, 2017 · 013b3e9 · 013b3e9
1 parent 43417d4
commit 013b3e9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/client/head.html b/client/head.html
@@ -9,4 +9,6 @@
   <link rel="manifest" href="/manifest.json">
   <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
   <meta name="theme-color" content="#ff0000">
+
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"></script>
 </head>
diff --git a/imports/startup/client/_main.js b/imports/startup/client/_main.js
@@ -24,3 +24,6 @@ import "/imports/ui/helpers/handlebars-lists.js"
 
 // Notifications
 import "/imports/modules/notifier.js"
+
+// Bootstrap
+import "bootstrap"
diff --git a/imports/ui/shared/header/header.html b/imports/ui/shared/header/header.html
@@ -6,20 +6,22 @@
 
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
         aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
+        <span class="navbar-toggler-icon"></span>
+      </button>
 
       <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
           <li class="nav-item {{isActiveRoute 'frontpage'}}">
-            <a class="nav-link" href="{{pathFor 'frontpage'}}">Home <span class="sr-only">(current)</span></a>
+            <a class="nav-link" href="{{pathFor 'frontpage'}}">Home
+              <span class="sr-only">(current)</span>
+            </a>
           </li>
           <li class="nav-item {{isActiveRoute 'documentsIndex'}}">
             <a class="nav-link" href="{{pathFor 'documentsIndex'}}">Documents</a>
           </li>
         </ul>
 
-        <ul class="navbar-nav float-right">
+        <ul class="navbar-nav">
           <li class="nav-item {{isActiveRoute 'about'}}">
             <a class="nav-link" href="{{pathFor 'about'}}">About</a>
           </li>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "bootstrap": "^4.0.0-beta.2",
+    "jquery": "^3.2.1",
     "meteor-node-stubs": "^0.2.11",
     "moment": "^2.19.2",
     "noty": "^3.1.3",