Massive cleanup of previous templating logic

marcgg · May 4, 2014 · 3a8d048 · 3a8d048
1 parent cd4031b
commit 3a8d048
Show file tree

Hide file tree

Showing 221 changed files with 230 additions and 6,458 deletions.
diff --git a/_includes/JB/analytics b/_includes/JB/analytics
diff --git a/_includes/JB/analytics-providers/google b/_includes/JB/analytics-providers/google
diff --git a/_includes/JB/categories_list b/_includes/JB/categories_list
diff --git a/_includes/JB/comments b/_includes/JB/comments
diff --git a/_includes/JB/comments-providers/disqus b/_includes/JB/comments-providers/disqus
diff --git a/_includes/JB/comments-providers/facebook b/_includes/JB/comments-providers/facebook
diff --git a/_includes/JB/comments-providers/intensedebate b/_includes/JB/comments-providers/intensedebate
diff --git a/_includes/JB/comments-providers/livefyre b/_includes/JB/comments-providers/livefyre
diff --git a/_includes/JB/liquid_raw b/_includes/JB/liquid_raw
diff --git a/_includes/JB/pages_list b/_includes/JB/pages_list
diff --git a/_includes/JB/posts_collate b/_includes/JB/posts_collate
diff --git a/_includes/JB/setup b/_includes/JB/setup
diff --git a/_includes/JB/sharing b/_includes/JB/sharing
diff --git a/_includes/JB/tags_list b/_includes/JB/tags_list
diff --git a/_includes/themes/v2/default.html b/_includes/themes/v2/default.html
@@ -12,9 +12,9 @@
 
     <link href='http://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
     <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,700italic,400,700,300' rel='stylesheet' type='text/css'>
-    <link href="{{ ASSET_PATH }}/css/app.css?body=1" rel="stylesheet" type="text/css" media="all">
+    <link href="/assets/css/app.css?body=1" rel="stylesheet" type="text/css" media="all">
     <link href="/atom.xml" rel="alternate" type="application/atom+xml" title="Marcgg#Blog">
-    <link rel="shortcut icon" href="{{ ASSET_PATH }}/favicon.ico">
+    <link rel="shortcut icon" href="/assets/favicon.ico">
   </head>
 
   <body>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,6 +1,5 @@
 ---
-theme :
-  name : v2
+layout: default
 ---
-{% include JB/setup %}
 {% include themes/v2/default.html %}
+
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -1,5 +1,5 @@
 ---
 layout: default
 ---
-{% include JB/setup %}
 {% include themes/v2/page.html %}
+
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -1,5 +1,4 @@
 ---
 layout: default
 ---
-{% include JB/setup %}
 {% include themes/v2/post.html %}
diff --git a/_plugins/debug.rb b/_plugins/debug.rb