Merge branch 'master' of github.com:pydanny/cookiecutter-django

.editorconfig

@@ -12,7 +12,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.yml]
+[*.{html,css,scss,json,yml}]
 indent_style = space
 indent_size = 2
 

docs/linters.rst

@@ -2,3 +2,16 @@ Linters
 =======
 
 .. index:: linters
+
+
+flake8
+-------
+
+To run flake8:
+
+    $ flake8
+
+The config for flake8 is located in setup.cfg. It specifies:
+
+* Set max line length to 120 chars
+* Exclude .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules

{{cookiecutter.repo_name}}/.editorconfig

@@ -19,7 +19,7 @@ known_first_party={{ cookiecutter.repo_name }}
 multi_line_output=3
 default_section=THIRDPARTY
 
-[*.yml]
+[*.{html,css,scss,json,yml}]
 indent_style = space
 indent_size = 2
 

{{cookiecutter.repo_name}}/.gitignore

@@ -55,3 +55,6 @@ node_modules/
 
 # virtual environments
 .env
+
+# User-uploaded media
+{{ cookiecutter.repo_name }}/media/

{{cookiecutter.repo_name}}/requirements/production.txt

@@ -17,7 +17,7 @@ Collectfast==0.2.3
 
 # Mailgun Support
 # ---------------
-django-mailgun==0.6.0
+django-mailgun==0.7.2
 
 {% if cookiecutter.use_sentry == "y" -%}
 # Raven is the Sentry client

{{cookiecutter.repo_name}}/setup.cfg

@@ -1,4 +1,3 @@
 [flake8]
-#ignore = E265
 max-line-length = 120
-exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs
+exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules

{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css

@@ -28,3 +28,11 @@
     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
+*/
+[hidden][style="display: block;"] {
+  display: block !important;
+}

{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss

@@ -13,3 +13,28 @@
   background-color: #f2dede;
   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-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
+*/
+[hidden][style="display: block;"] {
+  display: block !important;
+}