mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 16:08:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rebase stylinggetting there

Browse source
This commit is contained in:
Peter Cottle 2012-12-20 09:58:38 -08:00
parent d7d700c841
commit 8bf28ebc20
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/bundle.js
View file

@ -8531,8 +8531,8 @@ var InteractiveRebaseView = BaseView.extend({
// then make it reorderable.. // then make it reorderable..
listHolder.sortable({ listHolder.sortable({
distance: 5, //distance: 5,
placeholder: 'ui-state-highlight' placeholder: 'rebaseEntry transitionOpacity ui-state-highlight'
}); });
} }
}); });
@ -14785,8 +14785,8 @@ var InteractiveRebaseView = BaseView.extend({
// then make it reorderable.. // then make it reorderable..
listHolder.sortable({ listHolder.sortable({
distance: 5, //distance: 5,
placeholder: 'ui-state-highlight' placeholder: 'rebaseEntry transitionOpacity ui-state-highlight'
}); });
} }
}); });

4
src/js/views/rebaseView.js
View file

@ -96,8 +96,8 @@ var InteractiveRebaseView = BaseView.extend({
// then make it reorderable.. // then make it reorderable..
listHolder.sortable({ listHolder.sortable({
distance: 5, //distance: 5,
placeholder: 'ui-state-highlight' placeholder: 'rebaseEntry transitionOpacity ui-state-highlight'
}); });
} }
}); });

10
src/style/main.css
View file

@ -370,6 +370,16 @@ li.rebaseEntry {
padding: 5px; padding: 5px;
} }
li.rebaseEntry.ui-state-highlight {
padding: 15px;
border: 1px dashed rgba(0, 0, 0, 0.5);
}
/* wtf jquery UI sortable is barfing here on calculating the position... */
li.rebaseEntry.ui-sortable-helper {
margin-top: -140px;
}
li.rebaseEntry a#toggleButton { li.rebaseEntry a#toggleButton {
cursor: pointer; cursor: pointer;
} }