6 years ago · 6c40a5f15c
--- a/css/zoom.css
+++ b/css/zoom.css
@@ -0,0 +1,33 @@
 
				+img[data-action="zoom"] {
			
 
				+  cursor: zoom-in;
			
 
				+}
			
 
				+.zoom-img,
			
 
				+.zoom-img-wrap {
			
 
				+  position: relative;
			
 
				+  z-index: 666;
			
 
				+  -webkit-transition: all 300ms;
			
 
				+  transition: all 300ms;
			
 
				+}
			
 
				+img.zoom-img {
			
 
				+  cursor: zoom-out;
			
 
				+}
			
 
				+.zoom-overlay {
			
 
				+  z-index: 420;
			
 
				+  background: #fff;
			
 
				+  position: fixed;
			
 
				+  top: 0;
			
 
				+  left: 0;
			
 
				+  right: 0;
			
 
				+  bottom: 0;
			
 
				+  pointer-events: none;
			
 
				+  filter: "alpha(opacity=0)";
			
 
				+  opacity: 0;
			
 
				+  -webkit-transition: opacity 300ms;
			
 
				+  transition:      opacity 300ms;
			
 
				+}
			
 
				+.zoom-overlay-open .zoom-overlay {
			
 
				+  filter: "alpha(opacity=100)";
			
 
				+  opacity: 1;
			
 
				+}
			
 
				+
			
 
				+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2Nzcy96b29tLmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtFQUNFLGdCQUFnQjtDQUNqQjtBQUNEOztFQUVFLG1CQUFtQjtFQUNuQixhQUFhO0VBQ2IsOEJBQXNCO0VBQXRCLHNCQUFzQjtDQUN2QjtBQUNEO0VBQ0UsaUJBQWlCO0NBQ2xCO0FBQ0Q7RUFDRSxhQUFhO0VBQ2IsaUJBQWlCO0VBQ2pCLGdCQUFnQjtFQUNoQixPQUFPO0VBQ1AsUUFBUTtFQUNSLFNBQVM7RUFDVCxVQUFVO0VBQ1YscUJBQXFCO0VBQ3JCLDJCQUEyQjtFQUMzQixXQUFXO0VBQ1gsa0NBQStCO0VBQS9CLCtCQUErQjtDQUNoQztBQUNEO0VBQ0UsNkJBQTZCO0VBQzdCLFdBQVc7Q0FDWiIsImZpbGUiOiJ6b29tLmNzcyIsInNvdXJjZXNDb250ZW50IjpbImltZ1tkYXRhLWFjdGlvbj1cInpvb21cIl0ge1xuICBjdXJzb3I6IHpvb20taW47XG59XG4uem9vbS1pbWcsXG4uem9vbS1pbWctd3JhcCB7XG4gIHBvc2l0aW9uOiByZWxhdGl2ZTtcbiAgei1pbmRleDogNjY2O1xuICB0cmFuc2l0aW9uOiBhbGwgMzAwbXM7XG59XG5pbWcuem9vbS1pbWcge1xuICBjdXJzb3I6IHpvb20tb3V0O1xufVxuLnpvb20tb3ZlcmxheSB7XG4gIHotaW5kZXg6IDQyMDtcbiAgYmFja2dyb3VuZDogI2ZmZjtcbiAgcG9zaXRpb246IGZpeGVkO1xuICB0b3A6IDA7XG4gIGxlZnQ6IDA7XG4gIHJpZ2h0OiAwO1xuICBib3R0b206IDA7XG4gIHBvaW50ZXItZXZlbnRzOiBub25lO1xuICBmaWx0ZXI6IFwiYWxwaGEob3BhY2l0eT0wKVwiO1xuICBvcGFjaXR5OiAwO1xuICB0cmFuc2l0aW9uOiAgICAgIG9wYWNpdHkgMzAwbXM7XG59XG4uem9vbS1vdmVybGF5LW9wZW4gLnpvb20tb3ZlcmxheSB7XG4gIGZpbHRlcjogXCJhbHBoYShvcGFjaXR5PTEwMClcIjtcbiAgb3BhY2l0eTogMTtcbn1cbiJdfQ== */
			
--- a/images/branch-commit.odg
+++ b/images/branch-commit.odg
--- a/images/branch-commit.png
+++ b/images/branch-commit.png
--- a/images/branch-create-move.odg
+++ b/images/branch-create-move.odg
--- a/images/branch-create-move.png
+++ b/images/branch-create-move.png
--- a/images/branch-ff.odg
+++ b/images/branch-ff.odg
--- a/images/branch-ff.png
+++ b/images/branch-ff.png
--- a/images/branch-prototype.odg
+++ b/images/branch-prototype.odg
--- a/images/file-states.odg
+++ b/images/file-states.odg
--- a/images/file-states.png
+++ b/images/file-states.png
--- a/index.html
+++ b/index.html
@@ -1,6 +1,7 @@
 
				 <html>
			
 
				 	<head>
			
 
				 		<link rel="stylesheet" href="css/reveal.css">
			
 
				+		<link rel="stylesheet" href="css/zoom.css">
			
 
				 		<link rel="stylesheet" href="css/theme/white.css">
			
 
				         <title>Git crash course</title>
			
 
				 
			
@@ -10,6 +11,10 @@
 
				     margin-top: 5px !important;
			
 
				 }
			
 
				 
			
 
				+.two-cols ul, .two-cols h3 {
			
 
				+    float: left;
			
 
				+}
			
 
				+
			
 
				         </style>
			
 
				 	</head>
			
 
				 	<body>
			
@@ -19,7 +24,11 @@
 
				 			</div>
			
 
				 		</div>
			
 
				 		<script src="js/head.min.js"></script>
			
 
				-		<script src="js/reveal.js"></script><script>
			
 
				+		<script src="js/reveal.js"></script>
			
 
				+		<script src="js/jquery-3.2.1.min.js"></script>
			
 
				+		<script src="js/transition.js"></script>
			
 
				+		<script src="js/zoom.min.js"></script>
			
 
				+        <script>
			
 
				 Reveal.initialize({
			
 
				     width: "100%",
			
 
				 	height: "100%",
			
--- a/libs/head.min.js
+++ b/libs/head.min.js
--- a/js/jquery-3.2.1.min.js
+++ b/js/jquery-3.2.1.min.js
--- a/js/transition.js
+++ b/js/transition.js
@@ -0,0 +1,59 @@
 
				+/* ========================================================================
			
 
				+ * Bootstrap: transition.js v3.3.7
			
 
				+ * http://getbootstrap.com/javascript/#transitions
			
 
				+ * ========================================================================
			
 
				+ * Copyright 2011-2016 Twitter, Inc.
			
 
				+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
			
 
				+ * ======================================================================== */
			
 
				+
			
 
				+
			
 
				++function ($) {
			
 
				+  'use strict';
			
 
				+
			
 
				+  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
			
 
				+  // ============================================================
			
 
				+
			
 
				+  function transitionEnd() {
			
 
				+    var el = document.createElement('bootstrap')
			
 
				+
			
 
				+    var transEndEventNames = {
			
 
				+      WebkitTransition : 'webkitTransitionEnd',
			
 
				+      MozTransition    : 'transitionend',
			
 
				+      OTransition      : 'oTransitionEnd otransitionend',
			
 
				+      transition       : 'transitionend'
			
 
				+    }
			
 
				+
			
 
				+    for (var name in transEndEventNames) {
			
 
				+      if (el.style[name] !== undefined) {
			
 
				+        return { end: transEndEventNames[name] }
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+    return false // explicit for ie8 (  ._.)
			
 
				+  }
			
 
				+
			
 
				+  // http://blog.alexmaccaw.com/css-transitions
			
 
				+  $.fn.emulateTransitionEnd = function (duration) {
			
 
				+    var called = false
			
 
				+    var $el = this
			
 
				+    $(this).one('bsTransitionEnd', function () { called = true })
			
 
				+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
			
 
				+    setTimeout(callback, duration)
			
 
				+    return this
			
 
				+  }
			
 
				+
			
 
				+  $(function () {
			
 
				+    $.support.transition = transitionEnd()
			
 
				+
			
 
				+    if (!$.support.transition) return
			
 
				+
			
 
				+    $.event.special.bsTransitionEnd = {
			
 
				+      bindType: $.support.transition.end,
			
 
				+      delegateType: $.support.transition.end,
			
 
				+      handle: function (e) {
			
 
				+        if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
			
 
				+      }
			
 
				+    }
			
 
				+  })
			
 
				+
			
 
				+}(jQuery);
			
--- a/js/zoom.min.js
+++ b/js/zoom.min.js
--- a/run.sh
+++ b/run.sh
@@ -3,7 +3,9 @@
 
				 git submodule init
			
 
				 git submodule update 2> /dev/null
			
 
				 mkdir -p reveal.js/js/
			
 
				-cp libs/head.min.js reveal.js/js/
			
 
				+cp js/* reveal.js/js/
			
 
				+cp css/* reveal.js/css/
			
 
				+cp images/* reveal.js/images/
			
 
				 rm -f reveal.js/index.html
			
 
				 ln index.html git-crash-course.md reveal.js/ 2> /dev/null
			
 
				 cd reveal.js