diff options
| author | Peter Kozak <spag@golwen.net> | 2013-02-12 13:07:17 +0000 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-02-12 13:07:17 +0000 |
| commit | 1abd4544ad482079765be838dd6819e9997af9ac (patch) | |
| tree | 6aa9c0f6e9ba2ee03e509a9858dc43cbafb25db6 /app/assets | |
| parent | 902447a1baf7e9d8385c269a601361c8c3f2f14b (diff) | |
| parent | fb66a5e5a4c5d5f9eac4a5e8de6a286482cb55d5 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/route_element.js.coffee | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/route_elements.css.scss | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/javascripts/route_element.js.coffee b/app/assets/javascripts/route_element.js.coffee new file mode 100644 index 0000000..75dc553 --- /dev/null +++ b/app/assets/javascripts/route_element.js.coffee @@ -0,0 +1,6 @@ +jQuery -> + $('#route_elements').sortable + axis: 'y' + handle: '.handle' + update: -> + $.post($(this).data('update-url'), $(this).sortable('serialize'))
\ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3e1cc66..44868e4 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -15,4 +15,5 @@ *= require call_routes *= require softkeys *= require phone_numbers + *= require route_elements */ diff --git a/app/assets/stylesheets/route_elements.css.scss b/app/assets/stylesheets/route_elements.css.scss new file mode 100644 index 0000000..a0080ab --- /dev/null +++ b/app/assets/stylesheets/route_elements.css.scss @@ -0,0 +1,5 @@ +#route_elements .handle { + font-size: 12px; + color: #777; + cursor: move; +}
\ No newline at end of file |