diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index f8c57233..d4e1bfe9 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -128,6 +128,7 @@ Listed in alphabetical order. Peter Bittner `@bittner`_ Raphael Pierzina `@hackebrot`_ Raony Guimarães Corrêa `@raonyguimaraes`_ + Reggie Riser `@reggieriser`_ René Muhl `@rm--`_ Roman Afanaskin `@siauPatrick`_ Roman Osipenko `@romanosipenko`_ @@ -220,6 +221,7 @@ Listed in alphabetical order. .. _@oubiga: https://github.com/oubiga .. _@parbhat: https://github.com/parbhat .. _@raonyguimaraes: https://github.com/raonyguimaraes +.. _@reggieriser: https://github.com/reggieriser .. _@rm--: https://github.com/rm-- .. _@romanosipenko: https://github.com/romanosipenko .. _@shireenrao: https://github.com/shireenrao diff --git a/README.rst b/README.rst index 2b239f78..babbf381 100644 --- a/README.rst +++ b/README.rst @@ -34,7 +34,7 @@ Features * For Django 1.10 * Works with Python 3.4.x or 3.5.x. Python 3.6 is experimental * Renders Django projects with 100% starting test coverage -* Twitter Bootstrap_ v4.0.0 - alpha 6 (`maintained Foundation fork`_ also available) +* Twitter Bootstrap_ v4.0.0 - beta 1 (`maintained Foundation fork`_ also available) * 12-Factor_ based settings via django-environ_ * Secure by default. We believe in SSL. * Optimized development and production settings diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css index 5f23c427..a7725c91 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css @@ -12,23 +12,6 @@ border-color: #eed3d7; } -/* This is a fix for the bootstrap4 alpha release */ -@media (max-width: 47.9em) { - .navbar-nav .nav-item { - float: none; - width: 100%; - display: inline-block; - } - - .navbar-nav .nav-item + .nav-item { - margin-left: 0; - } - - .nav.navbar-nav.pull-xs-right { - float: none !important; - } -} - /* Display django-debug-toolbar. See https://github.com/django-debug-toolbar/django-debug-toolbar/issues/742 and https://github.com/pydanny/cookiecutter-django/issues/317 diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss index 8dafa220..6e701f29 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss @@ -87,32 +87,6 @@ $red: #b94a48; color: $red; } -//////////////////////////////// - //Navbar// -//////////////////////////////// - -// This is a fix for the bootstrap4 alpha release - -.navbar { - border-radius: 0px; -} - -@media (max-width: 47.9em) { - .navbar-nav .nav-item { - display: inline-block; - float: none; - width: 100%; - } - - .navbar-nav .nav-item + .nav-item { - margin-left: 0; - } - - .nav.navbar-nav.pull-xs-right { - float: none !important; - } -} - //////////////////////////////// //Django Toolbar// //////////////////////////////// diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index f19ff588..6fdc1798 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -14,7 +14,7 @@ {% block css %} - + @@ -88,7 +88,7 @@ ================================================== --> {% block javascript %} - +