morpheus

commit ec1d79c4f346d3a0f7c85b3f26c1839c8f31db17
parent feeef2fef8b6140d3c5bcbcdc1388adbea283009
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 15 Oct 2017 18:36:55 +0200

Update Bootstrap

Signed-off-by: MTRNord <mtrnord1@gmail.com>

Diffstat:
M
docs/_includes/head.html
 | 
3
++-
M
docs/_includes/header.html
 | 
4
++--
M
docs/_includes/scripts.html
 | 
5
++++-
M
docs/_sass/_base.scss
 | 
2
+-

4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/docs/_includes/head.html b/docs/_includes/head.html
@@ -9,7 +9,8 @@
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
 
     <!-- Bootstrap Core CSS -->
-    <link rel="stylesheet" href="{{ site.baseurl }}vendor/bootstrap/css/bootstrap.min.css" type="text/css">
+    <!-- <link rel="stylesheet" href="{{ site.baseurl }}vendor/bootstrap/css/bootstrap.min.css" type="text/css">-->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
 
     <!-- Custom Fonts -->
     <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
@@ -1,7 +1,7 @@
 <header>
     <div class="container">
         <div class="row">
-            <div class="col-sm-7">
+            <div class="col-sm-6">
                 <div class="header-content">
                     <div class="header-content-inner">
                         <h1>Morpheus is a windows focused QT Chat Client for use with Matrix written in Golang.</h1>
@@ -9,7 +9,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-sm-5">
+            <div class="col-sm-6">
                 <div class="device-container">
                     <div class="device-mockup surface landscape">
                         <div class="device">
diff --git a/docs/_includes/scripts.html b/docs/_includes/scripts.html
@@ -8,6 +8,8 @@
 <script src="{{ site.baseurl }}js/jquery.easing.min.js"></script>
 <script src="{{ site.baseurl }}js/jquery.fittext.js"></script>
 <script src="{{ site.baseurl }}js/wow.min.js"></script>
+<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
 
 <!-- Custom Theme JavaScript -->
 <script src="{{ site.baseurl }}js/creative.js"></script>
@@ -16,7 +18,8 @@
 <script src="{{ site.baseurl }}vendor/jquery/jquery.min.js"></script>
 
 <!-- Bootstrap Core JavaScript -->
-<script src="{{ site.baseurl }}vendor/bootstrap/js/bootstrap.min.js"></script>
+<!--<script src="{{ site.baseurl }}vendor/bootstrap/js/bootstrap.min.js"></script>-->
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
 
 <!-- Plugin JavaScript -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
diff --git a/docs/_sass/_base.scss b/docs/_sass/_base.scss
@@ -215,7 +215,7 @@ header {
     .device-container {
       max-width: none;
       max-height: calc(0vh);
-      margin: 139px auto 0;
+      margin: 100px auto 0;
     }
   }
 }