Merge branch 'release-1.3.2'

otto-torino · Jan 18, 2019 · 031f9d2 · 031f9d2
2 parents 180fbc5 + 76f9eed
commit 031f9d2
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,6 @@ baton/static/baton/app/npm-debug.log
 baton/static/baton/app/node_modules
 build/
 dist/
+tags
 django_baton.egg-info/
 .ropeproject
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.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/styles/_changelist.scss b/baton/static/baton/app/src/styles/_changelist.scss
@@ -155,14 +155,6 @@
         @include make-col(8);
       }
 
-      select {
-        @extend .custom-select;
-        @extend .custom-select-sm;
-        -moz-appearance: none;
-        text-indent: .01px;
-        text-overflow: '';
-      }
-
       button {
         @extend .btn;
         @extend .btn-sm;
@@ -176,6 +168,14 @@
         display: none;
       }
     }
+
+    select {
+      @extend .custom-select;
+      @extend .custom-select-sm;
+      -moz-appearance: none;
+      text-indent: .01px;
+      text-overflow: '';
+    }
   }
 
   .results {

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

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