Merge branch 'release-1.12.6'

otto-torino · Dec 1, 2020 · 3d45a93 · 3d45a93
2 parents c3c7784 + d35486c
commit 3d45a93
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/dist/baton.min.js.map b/baton/static/baton/app/dist/baton.min.js.map
diff --git a/baton/static/baton/app/package-lock.json b/baton/static/baton/app/package-lock.json
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.12.5",
+  "version": "1.12.6",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/styles/_placeholders.scss b/baton/static/baton/app/src/styles/_placeholders.scss
@@ -640,11 +640,17 @@
   }
 
   .inline-related {
+    overflow-x: auto;
+
     &.empty-form, // stacked inline
     .empty-form { // tabular
       display: none !important; // inline extra param
     }
 
+    textarea {
+      display: inline;
+    }
+
     h3 {
       @extend .clearfix;
       @extend .mt-2;
@@ -684,7 +690,7 @@
     }
 
     > .module {
-      @extend .table-responsive;
+      // @extend .table-responsive;
       position: relative;
     }
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.12.5'
+version = u'1.12.6'
 # The full version, including alpha/beta/rc tags.
-release = u'1.12.5'
+release = u'1.12.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='django-baton',
-    version='1.12.5',
+    version='1.12.6',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',