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 styling gah wasting so much time

Browse source
This commit is contained in:
Peter Cottle 2012-12-20 10:52:13 -08:00
parent 8bf28ebc20
commit 3797fc9d85
3 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
build/bundle.js
View file

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

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

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

36
src/style/main.css
View file

@ -316,6 +316,7 @@ p.commandLine span.prompt {
#commandLineBar, #commandLineBar,
.terminal-window #inside, .terminal-window #inside,
li.rebaseEntry,
#terminal { #terminal {
background: #424242; background: #424242;
} }
@ -358,6 +359,12 @@ p.commandLine span.prompt {
padding: 0; padding: 0;
} }
.iRebaseDialog div#entryHolders {
width: 300px;
margin-left: auto;
margin-right: auto;
}
.iRebaseDialog div#entryHolders ul#rebaseEntries { .iRebaseDialog div#entryHolders ul#rebaseEntries {
list-style-type: none; list-style-type: none;
-webkit-padding-start: 0; -webkit-padding-start: 0;
@ -367,21 +374,32 @@ li.rebaseEntry {
margin: 10px; margin: 10px;
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.5);
cursor: move; cursor: move;
padding: 5px; padding: 10px 5px;
border: 1px solid rgba(0, 0, 0, 0.3);
} }
li.rebaseEntry.ui-state-highlight { li.rebaseEntry.ui-state-highlight {
padding: 15px; padding: 21px;
border: 1px dashed rgba(0, 0, 0, 0.5); border: 1px dashed rgba(0, 0, 0, 0.5);
} }
/* wtf jquery UI sortable is barfing here on calculating the position... */ /* wtf jquery UI sortable is barfing here on calculating the position... */
li.rebaseEntry.ui-sortable-helper { li.rebaseEntry.ui-sortable-helper {
margin-top: -140px; height: auto !important;
width: auto !important;
position: relative !important;
top: 0px !important;
left: -20px;
display: none;
} }
li.rebaseEntry a#toggleButton { li.rebaseEntry a#toggleButton {
cursor: pointer; cursor: pointer;
float: right;
position: relative;
font-size: 14px;
top: -5px;
right; -5px;
} }
li.rebaseEntry.notPicked { li.rebaseEntry.notPicked {
@ -432,7 +450,7 @@ li.rebaseEntry.notPicked {
} }
.modalView .terminal-window { .modalView .terminal-window {
margin-top: 20%; margin-top: 10%;
-webkit-transform: translate3d(0, -100%, 0); -webkit-transform: translate3d(0, -100%, 0);
} }
@ -458,12 +476,9 @@ li.rebaseEntry.notPicked {
box-shadow: rgba(0,0,0,1) 0 1px 0; box-shadow: rgba(0,0,0,1) 0 1px 0;
text-shadow: rgba(0,0,0,.4) 0 1px 0; text-shadow: rgba(0,0,0,.4) 0 1px 0;
color: white; color: white;
font-size: 14px;
font-family: Georgia, serif;
text-decoration: none;
vertical-align: middle; vertical-align: middle;
cursor:pointer; cursor: pointer;
} }
.uiButton:hover { .uiButton:hover {
border-top-color: #28597a; border-top-color: #28597a;
@ -504,13 +519,8 @@ li.rebaseEntry.notPicked {
box-shadow: rgba(0,0,0,1) 0 1px 0; box-shadow: rgba(0,0,0,1) 0 1px 0;
text-shadow: rgba(0,0,0,.4) 0 1px 0; text-shadow: rgba(0,0,0,.4) 0 1px 0;
color: white; color: white;
font-size: 14px;
font-family: Georgia, serif;
text-decoration: none;
vertical-align: middle; vertical-align: middle;
cursor:pointer; cursor:pointer;
position:absolute;
border-top: 1px solid #96d1f8; border-top: 1px solid #96d1f8;
background: #80007c; background: #80007c;