Merge branch 'develop' of https://github.com/fsprojects/FsReveal into…

… develop
fsprojects · Jun 14, 2015 · bd0d817 · bd0d817
2 parents 8ef53b2 + f91b390
commit bd0d817
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/FsReveal/FsReveal.fs b/src/FsReveal/FsReveal.fs
@@ -33,6 +33,7 @@ type FsReveal private() =
         printfn "Apply template : %s" FsRevealHelper.TemplateFile
         let output = Formatting.GenerateHTML template presentation
         File.WriteAllText(outDir @@ outFile, output)
+        copyFiles (fun f -> f.ToLower().Contains(".css")) (__SOURCE_DIRECTORY__ @@ "css") (outDir @@ "css")
 
     static let getPresentationFromScriptLines fsxFile fsiEvaluator lines = 
         let fsx = Formatting.preprocessing lines

diff --git a/src/FsReveal/css/fsreveal.css b/src/FsReveal/css/fsreveal.css
@@ -0,0 +1,7 @@
+.reveal pre code {
+	font-family: 'Droid Sans Mono', consolas, monospace;
+	padding: 0;
+	word-wrap: break-word;
+	overflow: visible;
+	max-height: none;
+}
diff --git a/src/FsReveal/template.html b/src/FsReveal/template.html
@@ -21,6 +21,7 @@
     <script src="fsharp.formatting/styles/tips.js" type="text/javascript"></script>
     <!-- For syntax highlighting -->
     <link rel="stylesheet" href="lib/css/zenburn.css">
+    <link rel="stylesheet" href="css/fsreveal.css">
     <!-- If the query includes 'print-pdf', include the PDF print sheet -->
     <script>
 			if( window.location.search.match( /print-pdf/gi ) ) {
@@ -54,6 +55,8 @@
     <script src="lib/js/head.min.js"></script>
     <script src="js/reveal.js"></script>
     <script>
+        // Add the nohighlight class and data-noescape attribute to code elements that have already been formatted by FSharp.Formatting
+        $('pre.highlighted code').addClass('nohighlight').attr('data-noescape', '');
 
         // Full list of configuration options available here:
         // https://github.com/hakimel/reveal.js#configuration