From 6322a26e7f942e1a2f07a2644e30632e12d5ee08 Mon Sep 17 00:00:00 2001 From: 7wonders Date: Fri, 8 Nov 2013 04:53:35 +0100 Subject: [PATCH] Added built in minify script changes so that select2-bootstrap is minified for production --- .gitignore | 5 +++++ django_select2/widgets.py | 10 +++++----- setup.py | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index acc40b5..90bfbf1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,8 @@ dist build docs/_build + +# Intellij +.idea/ +*.iml +*.iws diff --git a/django_select2/widgets.py b/django_select2/widgets.py index f3b4616..243c18e 100644 --- a/django_select2/widgets.py +++ b/django_select2/widgets.py @@ -44,23 +44,23 @@ def get_select2_css_libs(light=False): if light: return ('css/select2.css', 'css/select2-bootstrap.css') else: - return ('css/select2.css', 'css/extra.css', 'css/select2-bootstrap.css' ) + return ('css/select2.css', 'css/extra.css', 'css/select2-bootstrap.css') else: if light: - return ('css/select2.min.css', 'css/select2-bootstrap.min.css') + return ('css/select2-bootstrapped.min.css',) else: - return ('css/all.min.css', 'css/select2-bootstrap.min.css') + return ('css/all-bootstrapped.min.css',) else: if settings.configured and settings.DEBUG: if light: return ('css/select2.css',) else: - return ('css/select2.css', 'css/extra.css', ) + return ('css/select2.css', 'css/extra.css') else: if light: return ('css/select2.min.css',) else: - return ('css/all.min.css', ) + return ('css/all.min.css',) ### Light mixin and widgets ### diff --git a/setup.py b/setup.py index 9a8b86d..0e11971 100644 --- a/setup.py +++ b/setup.py @@ -160,6 +160,8 @@ if len(sys.argv) > 1 and 'sdist' == sys.argv[1]: minify(['static/js/heavy_data.js'], 'static/js/heavy_data.min.js', 'js') minify(['static/css/select2.css'], 'static/css/select2.min.css', 'css') minify(['static/css/select2.css', 'static/css/extra.css'], 'static/css/all.min.css', 'css') + minify(['static/css/select2.css', 'static/css/select2-bootstrap.css'], 'static/css/select2-bootstrapped.min.css', 'css') + minify(['static/css/select2.css', 'static/css/extra.css', 'static/css/select2-bootstrap.css'], 'static/css/all-bootstrapped.min.css', 'css') setup( name=NAME,