summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sphinx/builders/changes.py6
-rw-r--r--sphinx/jinja2glue.py3
2 files changed, 7 insertions, 2 deletions
diff --git a/sphinx/builders/changes.py b/sphinx/builders/changes.py
index 6f057b49d..d4520fa54 100644
--- a/sphinx/builders/changes.py
+++ b/sphinx/builders/changes.py
@@ -129,8 +129,12 @@ class ChangesBuilder(Builder):
f.write(self.templates.render('changes/rstsource.html', ctx))
finally:
f.close()
- shutil.copyfile(path.join(package_dir, 'static', 'default.css'),
+ shutil.copyfile(path.join(package_dir, 'themes', 'default',
+ 'static', 'default.css'),
path.join(self.outdir, 'default.css'))
+ shutil.copyfile(path.join(package_dir, 'themes', 'basic',
+ 'static', 'basic.css'),
+ path.join(self.outdir, 'basic.css'))
def hl(self, text, version):
text = escape(text)
diff --git a/sphinx/jinja2glue.py b/sphinx/jinja2glue.py
index fc3efc017..c51603769 100644
--- a/sphinx/jinja2glue.py
+++ b/sphinx/jinja2glue.py
@@ -35,7 +35,8 @@ class BuiltinTemplateLoader(TemplateBridge, jinja2.BaseLoader):
# prepend explicit template paths
if builder.config.templates_path:
- chain[0:0] = builder.config.templates_path
+ chain[0:0] = [path.join(builder.confdir, tp)
+ for tp in builder.config.templates_path]
# make the paths into loaders
self.loaders = map(jinja2.FileSystemLoader, chain)