mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-14 08:34:26 +02:00
nice have left and right view also
This commit is contained in:
parent
ff809dd85f
commit
7d05c5167d
4 changed files with 13 additions and 37 deletions
|
@ -5632,7 +5632,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
|
||||||
.then(_.bind(function(userSpecifiedRebase) {
|
.then(_.bind(function(userSpecifiedRebase) {
|
||||||
// first, they might have dropped everything (annoying)
|
// first, they might have dropped everything (annoying)
|
||||||
if (!userSpecifiedRebase.length) {
|
if (!userSpecifiedRebase.length) {
|
||||||
throw new GitError({
|
throw new CommandResult({
|
||||||
msg: 'Nothing to do...'
|
msg: 'Nothing to do...'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -8534,7 +8534,9 @@ var InteractiveRebaseView = ContainedBase.extend({
|
||||||
this.confirm();
|
this.confirm();
|
||||||
}, this))
|
}, this))
|
||||||
.fail(_.bind(function() {
|
.fail(_.bind(function() {
|
||||||
this.deferred.reject();
|
// empty array does nothing, just like in git
|
||||||
|
this.hide();
|
||||||
|
this.deferred.resolve([]);
|
||||||
}, this))
|
}, this))
|
||||||
.done();
|
.done();
|
||||||
|
|
||||||
|
@ -12650,7 +12652,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
|
||||||
.then(_.bind(function(userSpecifiedRebase) {
|
.then(_.bind(function(userSpecifiedRebase) {
|
||||||
// first, they might have dropped everything (annoying)
|
// first, they might have dropped everything (annoying)
|
||||||
if (!userSpecifiedRebase.length) {
|
if (!userSpecifiedRebase.length) {
|
||||||
throw new GitError({
|
throw new CommandResult({
|
||||||
msg: 'Nothing to do...'
|
msg: 'Nothing to do...'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -14920,7 +14922,9 @@ var InteractiveRebaseView = ContainedBase.extend({
|
||||||
this.confirm();
|
this.confirm();
|
||||||
}, this))
|
}, this))
|
||||||
.fail(_.bind(function() {
|
.fail(_.bind(function() {
|
||||||
this.deferred.reject();
|
// empty array does nothing, just like in git
|
||||||
|
this.hide();
|
||||||
|
this.deferred.resolve([]);
|
||||||
}, this))
|
}, this))
|
||||||
.done();
|
.done();
|
||||||
|
|
||||||
|
|
|
@ -1017,7 +1017,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
|
||||||
.then(_.bind(function(userSpecifiedRebase) {
|
.then(_.bind(function(userSpecifiedRebase) {
|
||||||
// first, they might have dropped everything (annoying)
|
// first, they might have dropped everything (annoying)
|
||||||
if (!userSpecifiedRebase.length) {
|
if (!userSpecifiedRebase.length) {
|
||||||
throw new GitError({
|
throw new CommandResult({
|
||||||
msg: 'Nothing to do...'
|
msg: 'Nothing to do...'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,9 @@ var InteractiveRebaseView = ContainedBase.extend({
|
||||||
this.confirm();
|
this.confirm();
|
||||||
}, this))
|
}, this))
|
||||||
.fail(_.bind(function() {
|
.fail(_.bind(function() {
|
||||||
this.deferred.reject();
|
// empty array does nothing, just like in git
|
||||||
|
this.hide();
|
||||||
|
this.deferred.resolve([]);
|
||||||
}, this))
|
}, this))
|
||||||
.done();
|
.done();
|
||||||
|
|
||||||
|
|
|
@ -112,12 +112,6 @@ body,
|
||||||
background: #EEE;
|
background: #EEE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#canvasWrapper {
|
|
||||||
}
|
|
||||||
|
|
||||||
#commandTextField {
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Toolbar */
|
/* Toolbar */
|
||||||
|
|
||||||
div.toolbar {
|
div.toolbar {
|
||||||
|
@ -502,6 +496,7 @@ li.rebaseEntry.notPicked {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.uiButton:hover {
|
.uiButton:hover {
|
||||||
border-top-color: #28597a;
|
border-top-color: #28597a;
|
||||||
background: #28597a;
|
background: #28597a;
|
||||||
|
@ -532,18 +527,6 @@ li.rebaseEntry.notPicked {
|
||||||
}
|
}
|
||||||
|
|
||||||
.uiButtonPink {
|
.uiButtonPink {
|
||||||
padding: 5px 10px;
|
|
||||||
-webkit-border-radius: 8px;
|
|
||||||
-moz-border-radius: 8px;
|
|
||||||
border-radius: 8px;
|
|
||||||
-webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
|
|
||||||
-moz-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;
|
|
||||||
color: white;
|
|
||||||
vertical-align: middle;
|
|
||||||
cursor:pointer;
|
|
||||||
|
|
||||||
border-top: 1px solid #96d1f8;
|
border-top: 1px solid #96d1f8;
|
||||||
background: #80007c;
|
background: #80007c;
|
||||||
background: -webkit-gradient(linear, left top, left bottom, from(#fa1ee0), to(#80007c));
|
background: -webkit-gradient(linear, left top, left bottom, from(#fa1ee0), to(#80007c));
|
||||||
|
@ -591,19 +574,6 @@ li.rebaseEntry.notPicked {
|
||||||
background: -moz-linear-gradient(top, #d1edff, #449ad4);
|
background: -moz-linear-gradient(top, #d1edff, #449ad4);
|
||||||
background: -ms-linear-gradient(top, #d1edff, #449ad4);
|
background: -ms-linear-gradient(top, #d1edff, #449ad4);
|
||||||
background: -o-linear-gradient(top, #d1edff, #449ad4);
|
background: -o-linear-gradient(top, #d1edff, #449ad4);
|
||||||
padding: 5px 10px;
|
|
||||||
-webkit-border-radius: 8px;
|
|
||||||
-moz-border-radius: 8px;
|
|
||||||
border-radius: 8px;
|
|
||||||
-webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
|
|
||||||
-moz-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;
|
|
||||||
color: #000000;
|
|
||||||
font-size: 14px;
|
|
||||||
font-family: Georgia, serif;
|
|
||||||
text-decoration: none;
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.uiButtonWhite:hover {
|
.uiButtonWhite:hover {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue