mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-28 14:45:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge master

Browse source
This commit is contained in:
Peter Cottle 2021-01-04 08:39:47 -07:00
commit 19ad7a5f19
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/sandbox/index.js
View file

@ -234,6 +234,15 @@ var Sandbox = Backbone.View.extend({
},
resetSolved: function(command, deferred) {
if (command.get('regexResults').input !== 'reset solved --confirm') {
command.set('error', new Errors.GitError({
msg: 'Reset solved will mark each level as not yet solved; because ' +
'this is a destructive command, please pass in --confirm to execute',
}));
command.finishWith(deferred);
return;
}
LevelActions.resetLevelsSolved();
command.addWarning(
intl.str('solved-map-reset')

8
src/levels/rampup/interactiveRebase.js
View file

@ -75,10 +75,12 @@ exports.level = {
"markdowns": [
"When the interactive rebase dialog opens, you have the ability to do two things in our educational application:",
"",
"* You can reorder commits simply by changing their order in the UI (in our window this means dragging and dropping with the mouse).",
"* You can choose to completely omit some commits. This is designated by `pick` -- toggling `pick` off means you want to drop the commit.",
"* You can reorder commits simply by changing their order in the UI (via dragging and dropping with the mouse).",
"* You can choose to keep all commits or drop specific ones. When the dialog opens, each commit is set to being included by the `pick` " +
"button being active. To drop a commit, click the `pick` button to toggle it off.",
"",
"*It is worth mentioning that in the real git interactive rebase you can do many more things like squashing (combining) commits, amending commit messages, and even editing the commits themselves. For our purposes though we will focus on these two operations above.*",
"*It is worth mentioning that in the real git interactive rebase you can do many more things like squashing (combining) commits, " +
"amending commit messages, and even editing the commits themselves. For our purposes though we will focus on these two operations above.*",
"",
"Great! Let's see an example."
]

12
src/style/main.css
View file

@ -260,6 +260,14 @@ body.hgMode .visBackgroundColor {
min-height: 400px;
}
div.ui-draggable-handle {
cursor: grab;
}
div.ui-draggable-dragging div.ui-draggable-handle {
cursor: grabbing;
}
div.canvasTerminalHolder > div.terminal-window-holder > div.wrapper {
height: 100%;
box-shadow: 0 0 12px rgb(0,0,0);
@ -433,6 +441,10 @@ div.toolbar > div.controls div.box.flex1 div:hover {
}
div.ui-draggable div.controls div.box.flex1 div {
cursor: pointer;
}
div.controls div.box.flex1 div.close {
background-color: #fb625f;
}