Frederic De Groef avatar Frederic De Groef committed d0f77b9

i love hyperbole and the half (+ custom full-page-image css black magic)

Comments (0)

Files changed (9)

+// Replace instances of (CC) with the creative commons logo
+jQuery.fn.replaceCcWithLogo = function() {
+  this.each(function() {
+    $(this).html($(this).html().replace('(CC)', '<img width="25" height="25" class="cc" src="./file/cc.png">'));
+  });
+  return this;
+}

intro/01_slide.md

 !SLIDE title-slide center
+
+<script type="text/javascript">
+// Should get this to be triggered as part of setupPreso()
+$(function(){
+  $('a').replaceCcWithLogo();
+});
+</script>
+
+
 # Modern Version Control with Mercurial (hg) #
 
 ![hg-logo](mercurial_logo.png)

mercurial/01_dvcs.md

 # A brief history 
 
 * RCS
-* Centralized systems : cvs, svn, perforce
-* Distributed systems : **mercurial (hg)**, git, bazaar
+* centralized systems : cvs, svn, perforce
+* distributed systems : mercurial (hg), git, bazaar
 
 
 
 
+/*#footer {
+  visibility: hidden; 
+  margin-top: 5px;
+}*/
 
-.mice-img{
-    height:350px;
-    width: 238px;
+
+
+
+.full-page-image img:first-child {
+  
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+  /*margin: none;*/
+  padding: 0;
+  width: auto;
+  /* Set the height dynamically depending on the image's current width, keeping the aspect ratio */
+  height: 738px;
+}
+
+.full-page-image img.cc {
+  width: 1.2em;
+  height: 1.2em;
+  vertical-align: middle;
+}
+
+.full-page-image p {
+  margin: 0 0 0 0;
+}
+
+.full-page-image p:not(:first-child),
+.full-page-image h1,
+.full-page-image h2 {
+  z-index: 1;
+  background-image: url('white.png');
+  background-position: top left;
+}
+
+/* Image source box  */
+.full-page-image p:not(:first-child) {
+  position: relative;
+  opacity: .6;
+  top: -3em;
+  padding: 0.4em 0.9em 0.4em 0.9em;
+  color: dark-grey;
+  font-size: 1em;
+  float: right;
+}
+
+.full-page-image h1 {
+  position: absolute;
+  top: 1em;
+  left: 0px;
+  width: 100%;
+  padding: 0.3em 0 0.2em 0;
+  text-transform: uppercase;
+}
+
+.full-page-image h2 {
+  position: absolute;
+  top: 4em;
+  left: 0px;
+  width: 100%;
+  padding: 0.1em 0 0.3em 0;
 }

versionning/01_why.md

 
 
 
-!SLIDE incremental
+!SLIDE 
 
 # I already have enough work !
 

versionning/02_scenario.md

 !SLIDE  transition=scrollRight
 
 # Readability is important for productivity
-## Don't undermine this
+## don't undermine this
 
 
 
 
 
 
-!SLIDE bullets incremental
+!SLIDE
 
 # On a sufficiently small project, this might work
 
-## But do you really want to maintain 3 versions of the same function? 
+## but do you really want to maintain 3 versions of the same function? 
 
 
 
 !SLIDE
 
-# This is not good
+# This is **not** good
 
 
 
 !SLIDE bullets incremental
 
 # Now, for the bad part
-* What if you **need** to go back to an older, working version?
-* Also, creating experiments for debugging
+* what if you **need** to go back to an older, working version?
+* also, creating experiments for debugging
 
 
 
 
 # Reverting commented parts one by one!
 
-* This will be very error prone
-* Not to mention, unproductive.
-* You will probably make a mistake
-
+* this will be very error prone
+* not to mention, unproductive.
+* you will probably make a mistake
 
 
 !SLIDE
 
 # Sharing changes with your team ?
 
-* USB Flashdrive !
-* EMail !
+* usb flashdrive !
+* email !
 
 
-!SLIDE  full-page
+!SLIDE full-page-image
+
+![No!](marshmallow17.png)
+
+
+Image courtesy of <span xmlns:cc="http://creativecommons.org/ns#" about="http://hyperboleandahalf.blogspot.com/"><a rel="cc:attributionURL" property="cc:attributionName" href="http://hyperboleandahalf.blogspot.com/2010/10/god-of-cake.html">Allie Brosh</a> / <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/us/">(CC)</a></div>
+
+
+!SLIDE  full-page-image
 
 ![email](email.png)
 
+Image source <span xmlns:cc=""
+about="http://theoatmeal.com/"><a rel="cc:attributionURL"
+property="cc:attributionName"
+href="http://theoatmeal.com/comics/email">Matthew
+Inman</a> </div>
+
+
 
 !SLIDE center
 
 # Handling concurrent changes ?
-## Careful line by line review
+## careful line by line review
 
 ![](files_shadow.png)
 
-## Again, you will make mistakes
+## again, you will make mistakes
 
 
 
 
 ## Keypoint:
 # Detecting and resolving differences in text files is easy to do for a computer 
-## Let it do the work
+## let it do the work
 
 
 
Add a comment to this file

versionning/marshmallow17.png

Added
New image
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.