rebuild for CSS changes

build/bundle.js

@@ -18609,7 +18609,14 @@ require.define("/levels/rebase/2.js",function(require,module,exports,__dirname,_
 });
 
 require.define("/levels/mixed/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
-  "compareOnlyMasterHashAgnostic": true,
+  "compareOnlyMasterHashAgnosticWithAsserts": true,
+  "goalAsserts": {
+    "master": [
+      function(data) {
+        return data.C4 > data.C1;
+      }
+    ]
+  },
   "disabledMap": {
     "git revert": true
   },
@@ -18818,7 +18825,9 @@ require.define("/levels/mixed/2.js",function(require,module,exports,__dirname,__
           "type": "ModalAlert",
           "options": {
             "markdowns": [
-              "Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree "
+              "Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree ",
+              "",
+              "That being said, I can compare levels now based on structure and relative apostrophe differences. As long as your tree's `master` branch has the same structure and relative apostrophe differences, I'll give full credit"
             ]
           }
         }
@@ -18971,7 +18980,9 @@ require.define("/levels/mixed/3.js",function(require,module,exports,__dirname,__
           "type": "ModalAlert",
           "options": {
             "markdowns": [
-              "So in this level, let's accomplish the same objective of amending `C2` once but avoid using `rebase -i`. I'll leave it up to you to figure it out! :D"
+              "So in this level, let's accomplish the same objective of amending `C2` once but avoid using `rebase -i`. I'll leave it up to you to figure it out! :D",
+              "",
+              "Remember, the exact number of apostrophe's (') on the commit are not important, only the relative differences. For example, I will give credit to a tree that matches the goal tree but has one extra apostrophe everywhere"
             ]
           }
         }
@@ -32363,7 +32374,14 @@ require.define("/src/levels/intro/4.js",function(require,module,exports,__dirnam
 require("/src/levels/intro/4.js");
 
 require.define("/src/levels/mixed/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
-  "compareOnlyMasterHashAgnostic": true,
+  "compareOnlyMasterHashAgnosticWithAsserts": true,
+  "goalAsserts": {
+    "master": [
+      function(data) {
+        return data.C4 > data.C1;
+      }
+    ]
+  },
   "disabledMap": {
     "git revert": true
   },
@@ -32573,7 +32591,9 @@ require.define("/src/levels/mixed/2.js",function(require,module,exports,__dirnam
           "type": "ModalAlert",
           "options": {
             "markdowns": [
-              "Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree "
+              "Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree ",
+              "",
+              "That being said, I can compare levels now based on structure and relative apostrophe differences. As long as your tree's `master` branch has the same structure and relative apostrophe differences, I'll give full credit"
             ]
           }
         }
@@ -32727,7 +32747,9 @@ require.define("/src/levels/mixed/3.js",function(require,module,exports,__dirnam
           "type": "ModalAlert",
           "options": {
             "markdowns": [
-              "So in this level, let's accomplish the same objective of amending `C2` once but avoid using `rebase -i`. I'll leave it up to you to figure it out! :D"
+              "So in this level, let's accomplish the same objective of amending `C2` once but avoid using `rebase -i`. I'll leave it up to you to figure it out! :D",
+              "",
+              "Remember, the exact number of apostrophe's (') on the commit are not important, only the relative differences. For example, I will give credit to a tree that matches the goal tree but has one extra apostrophe everywhere"
             ]
           }
         }

build/main.d96da46a.css

@@ -193,9 +193,9 @@ div.canvasTerminalHolder {
 }
 
 div.gitDemonstrationView > div.visHolder,
-#mainVisSpace {
+.visBackgroundColor {
-  background: #24A7FF;
+  background: #5cbcfc;
-  background-color: #24A7FF;
+  background-color: #5cbcfc;
 }
 
 #interfaceWrapper {
@@ -261,10 +261,6 @@ div.canvasTerminalHolder > div.terminal-window-holder {
   max-width: 500px;
 }
 
-#controls {
-  background: #EEE;
-}
-
 /* Toolbar */
 
 div.toolbar {
@@ -470,6 +466,7 @@ p.commandLine span.prompt {
 #commandLineHistory {
   margin: 10px;
   border-radius: 5px;
+  box-shadow: 1px 0px 15px rgba(255,255,255,1);
 }
 
 #commandLineHistory #terminal.scrolling {
@@ -515,6 +512,7 @@ li.rebaseEntry,
 
 #terminal {
   border-bottom: 0;
+  padding: 0 5px;
 }
 
 #commandLineBar,

index.html

@@ -13,14 +13,14 @@
   <meta property="og:image" content="http://pcottle.github.com/learnGitBranching/assets/learnGitBranching.png"/>
   <meta property="og:description" content="A interactive Git visualization tool to educate and challenge!"/>
 
-	<link rel="stylesheet" href="build/main.96634d2f.css" type="text/css" charset="utf-8">
+	<link rel="stylesheet" href="build/main.d96da46a.css" type="text/css" charset="utf-8">
 	<link rel="stylesheet" href="src/style/font-awesome.css" type="text/css" charset="utf-8">
 </head>
 <body>
 
   <!-- The entire interface is within this div -->
   <div id="interfaceWrapper" class="box horizontal flex1">
-    <div id="controls" class="box vertical flex1">
+    <div id="controls" class="box vertical flex1 visBackgroundColor">
       <div id="commandLineHistory" class="box vertical flex3">
           <div class="toolbar box vertical center">
             <div class="controls box horizontal justify">
@@ -60,7 +60,7 @@
       </div>
     </div>
 
-    <div id="mainVisSpace" class="box flex1 horizontal">
+    <div id="mainVisSpace" class="box flex1 horizontal visBackgroundColor">
     </div>
   </div>
 
@@ -412,7 +412,7 @@
        For a much easier time perusing the source, see the individual files at:
           https://github.com/pcottle/learnGitBranching
   -->
-  <script src="build/bundle.min.35297231.js"></script>
+  <script src="build/bundle.min.43a1f886.js"></script>
 
   <!-- The advantage of github pages: super-easy, simple, slick static hostic.
        The downside? No raw logs to parse for analytics, so I have to include

src/levels/mixed/1.js

@@ -1,5 +1,12 @@
 exports.level = {
-  "compareOnlyMasterHashAgnostic": true,
+  "compareOnlyMasterHashAgnosticWithAsserts": true,
+  "goalAsserts": {
+    "master": [
+      function(data) {
+        return data.C4 > data.C1;
+      }
+    ]
+  },
   "disabledMap": {
     "git revert": true
   },

src/levels/mixed/2.js

@@ -61,7 +61,9 @@ exports.level = {
           "type": "ModalAlert",
           "options": {
             "markdowns": [
-              "Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree "
+              "Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree ",
+              "",
+              "That being said, I can compare levels now based on structure and relative apostrophe differences. As long as your tree's `master` branch has the same structure and relative apostrophe differences, I'll give full credit"
             ]
           }
         }

src/levels/mixed/3.js

@@ -62,7 +62,9 @@ exports.level = {
           "type": "ModalAlert",
           "options": {
             "markdowns": [
-              "So in this level, let's accomplish the same objective of amending `C2` once but avoid using `rebase -i`. I'll leave it up to you to figure it out! :D"
+              "So in this level, let's accomplish the same objective of amending `C2` once but avoid using `rebase -i`. I'll leave it up to you to figure it out! :D",
+              "",
+              "Remember, the exact number of apostrophe's (') on the commit are not important, only the relative differences. For example, I will give credit to a tree that matches the goal tree but has one extra apostrophe everywhere"
             ]
           }
         }

src/style/main.css

@@ -193,9 +193,9 @@ div.canvasTerminalHolder {
 }
 
 div.gitDemonstrationView > div.visHolder,
-#mainVisSpace {
+.visBackgroundColor {
-  background: #24A7FF;
+  background: #5cbcfc;
-  background-color: #24A7FF;
+  background-color: #5cbcfc;
 }
 
 #interfaceWrapper {
@@ -261,10 +261,6 @@ div.canvasTerminalHolder > div.terminal-window-holder {
   max-width: 500px;
 }
 
-#controls {
-  background: #EEE;
-}
-
 /* Toolbar */
 
 div.toolbar {
@@ -470,6 +466,7 @@ p.commandLine span.prompt {
 #commandLineHistory {
   margin: 10px;
   border-radius: 5px;
+  box-shadow: 1px 0px 15px rgba(255,255,255,1);
 }
 
 #commandLineHistory #terminal.scrolling {
@@ -515,6 +512,7 @@ li.rebaseEntry,
 
 #terminal {
   border-bottom: 0;
+  padding: 0 5px;
 }
 
 #commandLineBar,

src/template.index.html

@@ -20,7 +20,7 @@
 
   <!-- The entire interface is within this div -->
   <div id="interfaceWrapper" class="box horizontal flex1">
-    <div id="controls" class="box vertical flex1">
+    <div id="controls" class="box vertical flex1 visBackgroundColor">
       <div id="commandLineHistory" class="box vertical flex3">
           <div class="toolbar box vertical center">
             <div class="controls box horizontal justify">
@@ -60,7 +60,7 @@
       </div>
     </div>
 
-    <div id="mainVisSpace" class="box flex1 horizontal">
+    <div id="mainVisSpace" class="box flex1 horizontal visBackgroundColor">
     </div>
   </div>