IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1802 from pjxiao/feature-1794

Browse Source 
include builtin thmemes automatically #1794
This commit is contained in:
Takayuki SHIMIZUKAWA 2015-03-23 22:09:08 +09:00
commit 629961ebfe
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/theming.py
View File

@ -133,6 +133,11 @@ class Theme(object):
inherit = self.themeconf.get('theme', 'inherit') inherit = self.themeconf.get('theme', 'inherit')
except configparser.NoOptionError: except configparser.NoOptionError:
raise ThemeError('theme %r doesn\'t have "inherit" setting' % name) raise ThemeError('theme %r doesn\'t have "inherit" setting' % name)
if inherit in ['alabaster', 'sphinx_rtd_theme']:
# include 'alabaster' or 'sphinx_themes' automatically #1794
self.load_extra_theme(inherit)
if inherit == 'none': if inherit == 'none':
self.base = None self.base = None
elif inherit not in self.themes: elif inherit not in self.themes: