From 48484349148893b8761ef39d4b0e4b4bf59835f6 Mon Sep 17 00:00:00 2001
From: Waldir Pimenta <waldyrious@gmail.com>
Date: Mon, 4 Jan 2021 14:17:00 +0000
Subject: [PATCH 1/3] Improve styles for interactive pop-up windows

The title bar of floating windows that can be dragged
now shows a "grab" cursor when hovered,
and a "grabbing" cursor when being dragged.

The buttons in those windows, which are clickable,
now show the `pointer` (hand) cursor,
instead of the `default` (regular arrow) cursor.
---
 src/style/main.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/style/main.css b/src/style/main.css
index 07a23cd2..cd15030a 100644
--- a/src/style/main.css
+++ b/src/style/main.css
@@ -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;
 }

From 2ac8fc23d361ace7c6edfe994f7547be934c47f5 Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@instagram.com>
Date: Mon, 4 Jan 2021 08:30:00 -0700
Subject: [PATCH 2/3] Resolves #526 -- better language around the pick button

---
 src/levels/rampup/interactiveRebase.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/levels/rampup/interactiveRebase.js b/src/levels/rampup/interactiveRebase.js
index da97a036..d858f2ed 100644
--- a/src/levels/rampup/interactiveRebase.js
+++ b/src/levels/rampup/interactiveRebase.js
@@ -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."
             ]

From 1017efe3cfa05b63d5899960bf47346cc93b8f47 Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@instagram.com>
Date: Mon, 4 Jan 2021 08:39:32 -0700
Subject: [PATCH 3/3] Resolves #749 -- warning on reset solved command

---
 src/js/sandbox/index.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/js/sandbox/index.js b/src/js/sandbox/index.js
index 1227cfdb..c85d5f44 100644
--- a/src/js/sandbox/index.js
+++ b/src/js/sandbox/index.js
@@ -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')