Skip to content

Commit

Permalink
Merge branch 'release-1.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
abidibo committed Oct 13, 2017
2 parents effe057 + dd45271 commit 5acb346
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion 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.

11 changes: 11 additions & 0 deletions baton/static/baton/app/src/styles/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,15 @@
content: '\f00c';
}
}

.info {
@extend .alert;
@extend .alert-info;
@extend .pl-3;

&::before {
@extend %font-awesome;
content: '\f05a';
}
}
}
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.0.4',
version='1.0.5',
packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
include_package_data=True,
license='MIT License',
Expand Down

0 comments on commit 5acb346

Please sign in to comment.