merge

filamentgroup · Jul 10, 2014 · 2f0bfa1 · 2f0bfa1
1 parent 58c257f
commit 2f0bfa1
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 1,112 deletions.
diff --git a/example/.htaccess b/example/.htaccess
diff --git a/example/css/critical.css → example/_includes/critical.css b/example/css/critical.css → example/_includes/critical.css
diff --git a/example/js/enhance.js → example/_includes/enhance.js b/example/js/enhance.js → example/_includes/enhance.js
diff --git a/example/css/general.css b/example/css/general.css
diff --git a/example/css/sample1.css b/example/css/sample1.css
diff --git a/example/index.html b/example/index.html
@@ -1,22 +1,22 @@
 ---
 ---
 <!DOCTYPE html>
-<html lang="en">
+<html>
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<title>Sample template</title>
 		<meta name="fullcss"  content="css/full.css">
 		<meta name="fulljs"  content="/js/shoestring.ajaxinclude.enhancements.js">
 		<script>
-			{% include js/enhance.js %}
+			{% include enhance.js %}
 		</script>
 		<!--#if expr="$HTTP_COOKIE=/fullcss\=true/" -->
 		<link rel="stylesheet" href="css/full.css">
 		<!--#else -->
 		<style>
 			/* critical CSS styles for this template go here... */
-			{% include css/critical.css %}
+			{% include critical.css %}
 		</style>
 		<noscript><link rel="stylesheet" href="css/full.css"></noscript>
 	<!--#endif -->

diff --git a/example/js/enhance.config.js b/example/js/enhance.config.js
diff --git a/example/js/generalenhancements.js b/example/js/generalenhancements.js
diff --git a/example/js/lib/ajaxinclude.wrap.js b/example/js/lib/ajaxinclude.wrap.js
diff --git a/example/js/lib/enhance.js b/example/js/lib/enhance.js