Merge 54b80f5 into d507eca

cfpb · Oct 4, 2018 · 31a0282 · 31a0282
2 parents d507eca + 54b80f5
commit 31a0282
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/setup.py b/setup.py
@@ -6,8 +6,8 @@
 
 
 install_requires = [
-    'Django>=1.8,<2.1',
-    'wagtail>=1.13,<2.1',
+    'Django>=1.11,<2.2',
+    'wagtail>=1.13,<2.3',
 ]
 
 
@@ -43,8 +43,8 @@
     classifiers=[
         'Framework :: Django',
         'Framework :: Django :: 1.11',
-        'Framework :: Django :: 1.8',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
         'Framework :: Wagtail',
         'Framework :: Wagtail :: 1',
         'Framework :: Wagtail :: 2',

diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,8 @@
 skipsdist=True
 envlist=
     lint,
-    py{27,36}-dj{18,111}-wag{113},
-    py{36}-dj{20}-wag{20}
+    py{27,36}-dj{111}-wag{113},
+    py{36}-dj{20,21}-wag{20,21,22}
 
 [testenv]
 install_command=pip install -e ".[testing]" -U {opts} {packages}
@@ -19,11 +19,13 @@ basepython=
     py36: python3.6
 
 deps=
-    dj18: Django>=1.8,<1.9
     dj111: Django>=1.11,<1.12
     dj20: Django>=2.0,<2.1
+    dj21: Django>=2.1,<2.2
     wag113: wagtail>=1.13,<1.14
     wag20: wagtail>=2.0,<2.1
+    wag21: wagtail>=2.1,<2.2
+    wag22: wagtail>=2.2,<2.3
 
 [testenv:lint]
 basepython=python3.6

diff --git a/treemodeladmin/options.py b/treemodeladmin/options.py
@@ -57,7 +57,10 @@ def get_parent_field(self):
             return self.parent_field
 
     def get_index_view_extra_css(self):
-        css = ['treemodeladmin/css/index.css']
+        css = [
+            'wagtailmodeladmin/css/index.css',
+            'treemodeladmin/css/index.css'
+        ]
         css.extend(self.index_view_extra_css)
         return css
 

diff --git a/treemodeladmin/static/treemodeladmin/css/index.css b/treemodeladmin/static/treemodeladmin/css/index.css
@@ -20,6 +20,13 @@ header .button.bicolor {
     padding: 0;
 }
 
-.result-list td:not([class$=children]) {
-  vertical-align: top;
+.result-list.col12 tbody td.children:last-child {
+    padding-right: 0;
 }
+
+.listing td.children {
+    vertical-align: middle;
+}
+
+
+
diff --git a/treemodeladmin/tests/test_options.py b/treemodeladmin/tests/test_options.py
@@ -98,13 +98,16 @@ def test_get_parent_field_none(self):
     def test_get_index_view_extra_css(self):
         self.assertEqual(
             self.author_model_admin.get_index_view_extra_css(),
-            ['treemodeladmin/css/index.css', 'authors.css']
+            ['wagtailmodeladmin/css/index.css',
+             'treemodeladmin/css/index.css',
+             'authors.css']
         )
 
     def test_get_index_view_extra_css_none(self):
         self.assertEqual(
             self.plain_model_admin.get_index_view_extra_css(),
-            ['treemodeladmin/css/index.css']
+            ['wagtailmodeladmin/css/index.css',
+             'treemodeladmin/css/index.css']
         )
 
     def test_get_admin_urls_for_registration_child(self):