Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

Conflicts:
	app/helpers/admin/item_helper.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-11 18:09:34 +08:00
commit ef49df448d
6 files changed
+83 -6

No files matched your search

@@ -6,11 +6,11 @@
$('ol.sortable').nestedSortable({
disableNesting: 'no-nest',
forcePlaceholderSize: true,
handle: 'div',
handle: 'i',
helper: 'clone',
items: 'li',
maxLevels: 3,
opacity: .6,
opacity: .5,
placeholder: 'placeholder',
revert: 250,
tabSize: 25,