Merge branch 'hotfix-1.3.6'

otto-torino · Mar 4, 2019 · 1366b75 · 1366b75
2 parents 12b72e7 + fcc5374
commit 1366b75
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 14 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.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/styles/_login.scss b/baton/static/baton/app/src/styles/_login.scss
@@ -19,5 +19,19 @@
         display: inline-block;
       }
     }
+
+    form {
+      padding: 1rem;
+    }
+
+    input[type='text'],
+    input[type='password'] {
+      @extend .form-control;
+    }
+
+    .form-row {
+      margin-left: 0 !important;
+      margin-right: 0 !important;
+    }
   }
 }
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.5'
+version = u'1.3.6'
 # The full version, including alpha/beta/rc tags.
-release = u'1.3.5'
+release = u'1.3.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
@@ -9,7 +9,7 @@
 
 setup(
     name='django-baton',
-    version='1.3.5',
+    version='1.3.6',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',