From 14fd9bc5f55f3edb0f64e8f4483d3909863ad4ec Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 29 Jun 2018 14:56:38 -0400 Subject: [PATCH 1/2] updated to latest version of bootstrap 4 and all bootstrap 4 dependencies --- .../templates/base.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index 2cb705663..832fa7d12 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -17,8 +17,8 @@ {% block css %} {% endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %} - - + + {% endraw %}{% endif %}{% raw %} @@ -102,10 +102,11 @@ {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %} {% endraw %}{% else %}{% raw %} - - - - + + + + {% endraw %}{% endif %}{% raw %} From 24a59a7f5c7951a5a416d0cc4f1ab32e5ee69fbe Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 29 Jun 2018 15:00:36 -0400 Subject: [PATCH 2/2] added my name to the contributors list --- CONTRIBUTORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 6b3f00660..32339332c 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -125,6 +125,7 @@ Listed in alphabetical order. Mathijs Hoogland `@MathijsHoogland`_ Matt Braymer-Hayes `@mattayes`_ @mattayes Matt Linares + Matt Knapper `@mknapper1`_ @mknapper1 Matt Menzenski `@menzenski`_ Matt Warren `@mfwarren`_ Matthew Sisley `@mjsisley`_