diff options
| author | jessib <jessib@leap.se> | 2012-12-12 14:05:41 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-12-12 14:05:41 -0800 |
| commit | 961fe13b784e7f44e55f9cd0a106728c69354a0f (patch) | |
| tree | cf35c5a6b16a5e5c2497b86ce170204ec9c191ce /app/assets | |
| parent | 5e474bdaf93548f7bcc2d659bbbf11a19757d725 (diff) | |
| parent | 49d0ffe5f689ecb651b65beb4050b3f38cbb226e (diff) | |
Merge branch 'feature-new-comments-refactor' into develop
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 23d7fef..3fd641c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,7 +16,11 @@ //= require users //= require_tree . //= require bootstrap +//= require bootstrap-editable +//= require bootstrap-editable-rails +//= require bootstrap-editable-inline //= require jquery.pjax +//= require tickets $(function() { $('a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax('[data-pjax-container]'); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8dec07d..cb5fa1b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -12,3 +12,5 @@ table.table-hover .btn { table.table-hover tr:hover .btn { opacity: 1; } + +@import "bootstrap-editable";
\ No newline at end of file |