baby steps

ralsina · ralsina · commit 6df5331f7157 · 2015-05-04T22:43:23.000-03:00
diff --git a/nikola/data/themes/bootstrap3/bundles b/nikola/data/themes/bootstrap3/bundles
@@ -1,2 +1,2 @@
 assets/css/all.css=twitter-bootstrap::bootstrap.css,rst.css,code.css,jquery.colorbox::colorbox.css,theme.css,custom.css
-assets/js/all.js=jquery,twitter-bootstrap,jquery,jquery.colorbox,moment-js::moment-with-locales.min.js,fancydates.js
+assets/js/all.js=jquery,twitter-bootstrap,jquery,jquery.colorbox,moment.js::moment-with-locales.min.js,fancydates.js
diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -70,10 +70,8 @@ lang="${lang}">
         %if use_cdn:
             <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
             <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-            <script src="/assets/js/all.js"></script>
-        %else:
-            <script src="/assets/js/all-nocdn.js"></script>
         %endif
+        <script src="/assets/js/all.js"></script>
     %else:
         %if use_cdn:
             <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
@@ -97,10 +95,8 @@ lang="${lang}">
     %if use_bundles:
         %if use_cdn:
             <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
-            <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
-        %else:
-            <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
         %endif
+        <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
     %else:
         %if use_cdn:
             <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`assets/css/all.css=twitter-bootstrap::bootstrap.css,rst.css,code.css,jquery.colorbox::colorbox.css,theme.css,custom.css`
`2`		`-assets/js/all.js=jquery,twitter-bootstrap,jquery,jquery.colorbox,moment-js::moment-with-locales.min.js,fancydates.js`
	`2`	`+assets/js/all.js=jquery,twitter-bootstrap,jquery,jquery.colorbox,moment.js::moment-with-locales.min.js,fancydates.js`