mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-08-16 18:40:24 +03:00
Add the talk that I presented at GitMerge 2013.
This commit is contained in:
parent
34ad88aebf
commit
e7e4b9acee
8
Makefile
8
Makefile
@ -9,3 +9,11 @@ html: $(RST:.rst=.html)
|
||||
%.html: %.rst
|
||||
rst2html $< >$@
|
||||
|
||||
|
||||
module := doc/presentations/GitMerge-2013
|
||||
|
||||
html: $(module)/talk.html
|
||||
|
||||
$(module)/talk.html: $(module)/talk.rst
|
||||
rst2s5 --theme=small-white --current-slide $< $@
|
||||
|
||||
|
1
doc/presentations/GitMerge-2013/.gitignore
vendored
Normal file
1
doc/presentations/GitMerge-2013/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
/talk.html
|
9
doc/presentations/GitMerge-2013/README.txt
Normal file
9
doc/presentations/GitMerge-2013/README.txt
Normal file
@ -0,0 +1,9 @@
|
||||
I gave this talk on 2013-May-10 at the GitMerge conference in Berlin
|
||||
on "User Day".
|
||||
|
||||
(I gave another, more technical talk on a whiteboard the day before at
|
||||
"Developer Day".)
|
||||
|
||||
To convert it into HTML, run "make html" in the top-level directory.
|
||||
|
||||
-- Michael Haggerty
|
1382
doc/presentations/GitMerge-2013/talk.rst
Normal file
1382
doc/presentations/GitMerge-2013/talk.rst
Normal file
File diff suppressed because it is too large
Load Diff
@ -103,7 +103,7 @@ img.incremental {visibility: hidden;}
|
||||
|
||||
.slide table.docinfo {margin: 1em 0 0.5em 2em;}
|
||||
|
||||
pre.literal-block, pre.doctest-block {background-color: white;}
|
||||
pre.literal-block, pre.doctest-block {background-color: #EEE; font-size: 50%;}
|
||||
|
||||
tt.docutils {background-color: white;}
|
||||
|
||||
|
@ -419,7 +419,7 @@ function fontScale() { // causes layout problems in FireFox that get fixed if b
|
||||
var vSize = 700; // assuming 1024x768, minus chrome and such
|
||||
var hSize = 1024; // these do not account for kiosk mode or Opera Show
|
||||
}
|
||||
var newSize = Math.min(Math.round(vSize/vScale),Math.round(hSize/hScale));
|
||||
var newSize = Math.round(Math.min(vSize/vScale,hSize/hScale)*0.8);
|
||||
fontSize(newSize + 'px');
|
||||
if (isGe) { // hack to counter incremental reflow bugs
|
||||
var obj = document.getElementsByTagName('body')[0];
|
||||
|
Loading…
Reference in New Issue
Block a user