Consolidated loaded styles into a single template field

memoriestravel · Oct 12, 2013 · 305e780 · 305e780
1 parent e3ea4d5
commit 305e780
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/cleaver.js b/lib/cleaver.js
@@ -146,14 +146,17 @@ Cleaver.prototype._renderSlideshow = function () {
   // TODO: handle defaults gracefully
   var title = this.metadata.title || 'Untitled';
   var encoding = this.metadata.encoding || 'utf-8';
+  var style = [
+      this.resources.loaded.style,
+      this.resources.loaded.githubStyle,
+      this.external.loaded.style
+    ].join('\n');
 
   var layoutData = {
     slideshow: slideshow,
     title: title,
     encoding: encoding,
-    style: this.resources.loaded.style,
-    githubStyle: this.resources.loaded.githubStyle,
-    externalStyle: this.external.loaded.style
+    style: style
   };
 
   // Render the main layout

diff --git a/templates/layout.mustache b/templates/layout.mustache
@@ -6,8 +6,6 @@
   <title>{{title}}</title>
   <style type="text/css">
     {{{style}}}
-    {{{githubStyle}}}
-    {{{externalStyle}}}
   </style>
 </head>
 <body>