Merge pull request #494 from nsoranzo/update_bootstrap

Update bootstrap to v4.0.0-beta
galaxyproject · Aug 31, 2017 · fc3a029 · fc3a029
2 parents 5ea6b8c + 5a86d86
commit fc3a029
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/_includes/default-header.html b/_includes/default-header.html
@@ -1,5 +1,5 @@
 <header>
-    <nav class="navbar navbar-toggleable-md navbar-inverse">
+    <nav class="navbar navbar-expand-md navbar-dark">
         <div class="container">
             <a class="navbar-brand" href="{{ site.url }}/">
                 <img src="{{ site.url }}{{ site.small_logo }}" height="30" alt="Galaxy Training Network logo">

diff --git a/_layouts/base.html b/_layouts/base.html
@@ -7,7 +7,7 @@
         <meta http-equiv="x-ua-compatible" content="ie=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <title>{{ site.title }}</title>
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/bootstrap.min.css?v=2">
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/bootstrap.min.css?v=3">
         <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css?v=2">
         <link rel="stylesheet" href="{{ site.url }}/assets/css/font-awesome.css">
         <link rel="stylesheet" href="{{ site.url }}/assets/css/syntax_highlighting.css">
@@ -16,8 +16,8 @@
         {{ content }}
     </body>
     <script type="text/javascript" src="{{ site.url }}/assets/js/jquery.slim.min.js"></script>
-    <script type="text/javascript" src="{{ site.url }}/assets/js/tether.min.js"></script>
-    <script type="text/javascript" src="{{ site.url }}/assets/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="{{ site.url }}/assets/js/popper.min.js"></script>
+    <script type="text/javascript" src="{{ site.url }}/assets/js/bootstrap.min.js?v=3"></script>
     <script type="text/javascript" src="{{ site.url }}/assets/js/details-element-polyfill.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
 </html>
diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html
@@ -10,7 +10,7 @@
 {% endfor %}
 
 <header>
-    <nav class="navbar navbar-toggleable-md navbar-inverse">
+    <nav class="navbar navbar-expand-md navbar-dark">
         <div class="container">
             <a class="navbar-brand" href="{{ site.url }}/">
                 <img src="{{ site.url }}{{ site.small_logo }}" height="30" alt="Galaxy Training Network logo">

diff --git a/assets/css/bootstrap.min.css b/assets/css/bootstrap.min.css
diff --git a/assets/js/bootstrap.min.js b/assets/js/bootstrap.min.js
diff --git a/assets/js/popper.min.js b/assets/js/popper.min.js
diff --git a/assets/js/tether.min.js b/assets/js/tether.min.js