rebuild for CSS changes

This commit is contained in:
Peter Cottle 2013-03-10 12:57:42 -07:00
parent 3eab0aec44
commit 427b45f60f
10 changed files with 60 additions and 31 deletions

View file

@ -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 = { 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": { "disabledMap": {
"git revert": true "git revert": true
}, },
@ -18818,7 +18825,9 @@ require.define("/levels/mixed/2.js",function(require,module,exports,__dirname,__
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "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", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "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("/src/levels/intro/4.js");
require.define("/src/levels/mixed/1.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { 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": { "disabledMap": {
"git revert": true "git revert": true
}, },
@ -32573,7 +32591,9 @@ require.define("/src/levels/mixed/2.js",function(require,module,exports,__dirnam
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "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", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "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"
] ]
} }
} }

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored

File diff suppressed because one or more lines are too long

View file

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

View file

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

View file

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

View file

@ -61,7 +61,9 @@ exports.level = {
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "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"
] ]
} }
} }

View file

@ -62,7 +62,9 @@ exports.level = {
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "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"
] ]
} }
} }

View file

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

View file

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