Commits

Frederic De Groef committed 7eeb1fa

new images

Comments (0)

Files changed (5)

 
 
 .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;
+    margin: none;
+    padding: 0;
+    width: 100%;
+    /* Set the height dynamically depending on the image's current width, keeping the aspect ratio */
+    /*height: 738px;*/
+    height: auto;
 }
 
 .full-page-image img.cc {
 .full-page-image p:not(:first-child) {
   position: relative;
   opacity: .6;
-  top: -3em;
+  top: -5em;
   padding: 0.4em 0.9em 0.4em 0.9em;
   color: dark-grey;
   font-size: 1em;

versionning/02_scenario.md

 
 !SLIDE  full-page-image
 
-![email](email.png)
+![email from hell](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>
+Image courtesy of [Matthew Inman](http://theoatmeal.com/comics/email)
+
+
+
+!SLIDE full-page-image
+
+![Yay collaboration!](email_filename.png)
+
+
+!SLIDE center
+
+![](this_is_unacceptable.png)
 
 
 
 !SLIDE center
 
 # Handling concurrent changes ?
-## careful line by line review
+## careful line by line review ! 
 
 ![](files_shadow.png)
 
Add a comment to this file

versionning/email.png

Old
Old image
New
New image
Add a comment to this file

versionning/email_filename.png

Added
New image
Add a comment to this file

versionning/this_is_unacceptable.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.