Merge pull request #34 from vuLgAr/bootstrap4

Bootstrap4

Author: mjhea0

README.md

@@ -2,7 +2,7 @@
 
 Flask starter project for [Cookiecutter](https://github.com/audreyr/cookiecutter).
 
-[![Build Status](https://travis-ci.org/realpython/flask-skeleton.svg?branch=master)](https://travis-ci.org/realpython/flask-skeleton)
+[![Build Status](https://travis-ci.org/realpython/cookiecutter-flask-skeleton.svg?branch=master)](https://travis-ci.org/realpython/cookiecutter-flask-skeleton)
 
 ## Quick Start
 

{{cookiecutter.app_slug}}/project/client/static/main.css

@@ -1,5 +1,5 @@
 /* custom css */
 
 .site-content {
-  padding-top: 75px;
+  padding-top: 6rem;
 }

{{cookiecutter.app_slug}}/project/client/templates/_base.html

@@ -9,7 +9,7 @@
     <meta name="author" content="">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <!-- styles -->
-    <link href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.1/yeti/bootstrap.min.css" rel="stylesheet" media="screen">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
     <link href="{{url_for('static', filename='main.css')}}" rel="stylesheet" media="screen">
     {% block css %}{% endblock %}
   </head>
@@ -56,8 +56,9 @@
     {% include 'footer.html' %}
 
     <!-- scripts -->
-    <script src="//code.jquery.com/jquery-1.11.2.min.js" type="text/javascript"></script>
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js" type="text/javascript"></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.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
     <script src="{{url_for('static', filename='main.js')}}" type="text/javascript"></script>
     {% block js %}{% endblock %}
 

{{cookiecutter.app_slug}}/project/client/templates/footer.html

@@ -1,7 +1,11 @@
 <footer>
-  <div class="container">
-    <small>
-      <span>© <a href="mailto:[email protected]">Real Python</a></span>
-    </small>
-  </div>
+  <nav class="navbar fixed-bottom navbar-light bg-light">
+    <div class="container">
+      <small>
+        <span>©
+          <a href="mailto:[email protected]">Real Python</a>
+        </span>
+      </small>
+    </div>
+  </nav>
 </footer>

{{cookiecutter.app_slug}}/project/client/templates/header.html

@@ -1,35 +1,31 @@
-<header class="site-header">
-  <!-- Navigation -->
-  <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
-    <div class="container">
-      <!-- Brand and toggle get grouped for better mobile display -->
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-          <a class="navbar-brand" href="{{ url_for('main.home') }}">{{ config.APP_NAME }}</a>
-      </div>
-      <!-- Collect the nav links, forms, and other content for toggling -->
-      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-        <ul class="nav navbar-nav">
-          <li><a href="{{ url_for('main.about') }}">About</a></li>
-          {% if current_user.is_authenticated %}
-            <li><a href="{{ url_for('user.members') }}">Members</a></li>
-          {% endif %}
-        </ul>
-        <ul class="nav navbar-nav navbar-right">
-          {% if current_user.is_authenticated %}
-            <li><a href="{{ url_for('user.logout') }}">Logout</a></li>
-          {% else %}
-            <li><a href="{{ url_for('user.login') }}"><span class="glyphicon glyphicon-user"></span>&nbsp;Register/Login</a></li>
-          {% endif %}
-        </ul>
-      </div>
-      <!-- /.navbar-collapse -->
-    </div>
-    <!-- /.container -->
-  </nav>
-</header>
+<!-- Navigation -->
+<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
+  <!-- Navbar Brand -->
+  <a class="navbar-brand" href="{{ url_for('main.home') }}">{{ config.APP_NAME }}</a>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <div class="collapse navbar-collapse" id="navbarNav">
+    <!-- Main Navigation -->
+    <ul class="navbar-nav">
+      <li class="nav-item active">
+        <a class="nav-link" href="{{ url_for('main.about') }}">About <span class="sr-only">(current)</span></a>
+      </li>
+      {% if current_user.is_authenticated %}
+      <li class="nav-item">
+        <a class="nav-link" href="{{ url_for('user.members') }}">Members</a>
+      </li>
+      {% endif %}
+    </ul>
+    <!-- Login/Logout -->
+    <ul class="navbar-nav ml-auto">
+      <li class="nav-item">
+        {% if current_user.is_authenticated %}
+        <a class="nav-link" href="{{ url_for('user.logout') }}">Logout</a>
+        {% else %}
+        <a class="nav-link" href="{{ url_for('user.login') }}">Login</a>
+        {% endif %}
+      </li>
+    </ul>
+  </div>
+</nav>