summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2012-12-11 15:07:27 -0800
committerjessib <jessib@leap.se>2012-12-11 15:07:27 -0800
commit4259cad450fee703dc34ebe5322de994d06a5448 (patch)
tree8c07fe6f44379033a0fc677176dd8c8f935ad4a1 /app/assets
parent7a9a4f4e7bd090fd27e05b03f93832d79f5f8db2 (diff)
Playing around with using x-editable, which isn't yet working.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/application.js3
-rw-r--r--app/assets/stylesheets/application.scss2
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 23d7fef..57e6d62 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,6 +16,9 @@
//= require users
//= require_tree .
//= require bootstrap
+//= require bootstrap-editable
+//= require bootstrap-editable-rails
+//= require bootstrap-editable-inline
//= require jquery.pjax
$(function() {
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