Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bootstrap to v4.0.0-beta #494

Merged
merged 3 commits into from
Aug 31, 2017
Merged

Update bootstrap to v4.0.0-beta #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40bf07f
Update bootstrap to v4.0.0-beta
nsoranzo Aug 31, 2017
477ecde
Add popper.js, remove tether.js for bootstrap
nsoranzo Aug 31, 2017
5a86d86
Prevent caching issues for bootstrap
nsoranzo Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _includes/default-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
6 changes: 3 additions & 3 deletions _layouts/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
2 changes: 1 addition & 1 deletion _layouts/tutorial_hands_on.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 3 additions & 2 deletions assets/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions assets/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions assets/js/popper.min.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion assets/js/tether.min.js
View file
Open in desktop

This file was deleted.