Additional fixes for wagtail 2.11 (#396)

* CSS to adjust visual layout discrepancies from 2.11.
* Update setup.py
* Exclude `.venv` and other dirs from tooling.

.gitignore

@@ -13,10 +13,16 @@
 /docs/_build/
 /dist/
 __pycache__
-codered_cms.egg-info/
-coderedcms.egg-info/
+*.egg-info/
 pip-wheel-metadata/
 
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+
 # Editors
 .vscode/
 *~
@@ -28,6 +34,7 @@ junit/
 coverage.xml
 testproject*/
 .cache
+.pytest_cache
 testmedia*/
 teststatic*/
 media/

coderedcms/static/coderedcms/css/codered-admin.css

@@ -37,7 +37,7 @@ body.ready input[type='checkbox'], body.ready input[type='radio'] {
     border:none;
 }
 
-.halloeditor, .tagit, input, select, textarea {
+.halloeditor, .tagit, input:not([type="submit"]), select, textarea {
     border:1.5px solid #ddd;
     padding-top:0.5em;
     padding-bottom:0.5em;
@@ -47,13 +47,15 @@ body.ready input[type='checkbox'], body.ready input[type='radio'] {
 .halloeditor:hover, .tagit:hover, input:hover, select:hover, textarea:hover {
     border:1.5px solid #ddd;
 }
-.nav-search input:hover {
-    border-width: 1px;
+
+.nav-search button::before {
+    line-height: 2.5em;
 }
 
 input[type='checkbox'], input[type='radio'] {
     height:unset;
     margin-right: 0.5em;
+    padding-top: 0;
 }
 input[type='checkbox']::before, input[type='radio']::before {
     border:1.5px solid #ccc;

coderedcms/static/coderedcms/css/codered-editor.css

@@ -48,6 +48,10 @@ License: https://github.com/coderedcorp/coderedcms/blob/dev/LICENSE
     background-color:#f2fcfc;
 }
 
+.c-sf-button {
+    max-width: 200px;
+}
+
 .input input,
 .input select {
     width: 300px;
@@ -108,10 +112,6 @@ License: https://github.com/coderedcorp/coderedcms/blob/dev/LICENSE
     width: 100%;
 }
 
-.objects * {
-    box-sizing: border-box;
-}
-
 .object.stream-field {
     background-color: inherit;;
 }

requirements-dev.txt

@@ -1,6 +1,3 @@
-# Install coderedcms from local directory.
--e .
-
 # Everything from ci
 -r requirements-ci.txt
 

setup.cfg

@@ -1,5 +1,5 @@
 [flake8]
-exclude = coderedcms/project_template/*,*/migrations/*,schema.py
+exclude = .venv/*,build/*,coderedcms/project_template/*,*/migrations/*,schema.py
 max-line-length = 100
 
 [tool:pytest]

setup.py

@@ -1,5 +1,5 @@
 import os
-from setuptools import find_packages, setup
+from setuptools import setup
 from coderedcms import __version__
 
 with open(os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf8") as readme:
@@ -11,7 +11,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 setup(
     name='coderedcms',
     version=__version__,
-    packages=find_packages(),
+    packages=['coderedcms'],
     include_package_data=True,
     license='BSD License',
     description='Wagtail-based CMS by CodeRed for building marketing websites.',
@@ -41,11 +41,12 @@ setup(
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Internet :: WWW/HTTP :: Site Management',
     ],
+    python_requires='>=3.6',
     install_requires=[
         'beautifulsoup4>=4.8,<4.9',     # should be the same as wagtail
         'django-eventtools==1.0.*',
-        'django-bootstrap4>=1.0,<2.3',  # Version 2.0 only supports Python 3.6 and up.
-        'Django>2.1,<3.2',              # should be the same as wagtail
+        'django-bootstrap4>=2.0,<2.4',
+        'Django>=2.2,<3.2',             # should be the same as wagtail
         'geocoder==1.38.*',
         'icalendar==4.0.*',
         'wagtail==2.11.*',
@@ -53,9 +54,10 @@ setup(
         'wagtail-cache==1.*',
         'wagtail-import-export>=0.2,<0.3'
     ],
-    entry_points="""
-            [console_scripts]
-            coderedcms=coderedcms.bin.coderedcms:main
-    """,
+    entry_points={
+        "console_scripts": [
+            "coderedcms=coderedcms.bin.coderedcms:main"
+        ]
+    },
     zip_safe=False,
 )