Skip to content

Commit

Permalink
Merge branch 'release-1.5.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
abidibo committed Jun 21, 2019
2 parents 3ed4882 + 70f385e commit f81517f
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 17 deletions.
24 changes: 12 additions & 12 deletions baton/static/baton/app/dist/baton.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion baton/static/baton/app/dist/baton.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion baton/static/baton/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "baton",
"version": "1.5.2",
"version": "1.5.3",
"description": "Django Baton App",
"main": "index.js",
"scripts": {
Expand Down
5 changes: 5 additions & 0 deletions baton/static/baton/app/src/styles/_placeholders.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

.errorlist {
@extend .pt-2;
width: 100%;
}
}

Expand Down Expand Up @@ -301,6 +302,10 @@
}

// automcomplete
.select2-container--admin-autocomplete {
min-width: 320px; // m2m
}

.select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow {
height: 34px;
}
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
# built documents.
#
# The short X.Y version.
version = u'1.5.2'
version = u'1.5.3'
# The full version, including alpha/beta/rc tags.
release = u'1.5.2'
release = u'1.5.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name='django-baton',
version='1.5.2',
version='1.5.3',
packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
include_package_data=True,
license='MIT License',
Expand Down

0 comments on commit f81517f

Please sign in to comment.