From eec2d27504264c2d973aece82a9633015a0199f2 Mon Sep 17 00:00:00 2001
From: henu <henri.varjotie@aalto.fi>
Date: Tue, 31 Oct 2017 19:30:23 +0200
Subject: [PATCH] Update bootstrap version

---
 webapp/templates/base.html | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/webapp/templates/base.html b/webapp/templates/base.html
index 97506a5..755fb30 100644
--- a/webapp/templates/base.html
+++ b/webapp/templates/base.html
@@ -10,16 +10,19 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
         <meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry">
-        <!-- <link rel="stylesheet" href="{% static "css/webapp.css" %}"> -->
+        <link rel="stylesheet" href="{% static "css/webapp.css" %}">
 
         <title>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</title>
 
         <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-        <script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" integrity="sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" crossorigin="anonymous">
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+        <!-- <script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script> -->
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
+        <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
         <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
         <script src="{% static "js/lib/underscore-min.js" %}"></script>
+        <!-- <link href="https://fonts.googleapis.com/css?family=Didact+Gothic" rel="stylesheet"> -->
 
         <script>
         $(function () {