On Fri, Sep 2, 2016 at 12:38 AM, Markus Heiser
<markus.heiser@xxxxxxxxxxx> wrote:
>
>
>
> >
> > Signed-off-by: Eric Holscher <eric@xxxxxxxxxxxxxxxx>
> > ---
> > Documentation/conf.py | 14 ++++++++------
> > 1 file changed, 8 insertions(+), 6 deletions(-)
> >
> > diff --git a/Documentation/conf.py b/Documentation/conf.py
> > index 96b7aa6..1707193 100644
> > --- a/Documentation/conf.py
> > +++ b/Documentation/conf.py
> > @@ -179,12 +179,6 @@ except ImportError:
> >
> > html_static_path = ['sphinx-static']
> >
> > -html_context = {
> > - 'css_files': [
> > - '_static/theme_overrides.css',
> > - ],
> > -}
> > -
> > # Add any extra paths that contain custom files (such as robots.txt or
> > # .htaccess) here, relative to this directory. These files are copied
> > # directly to the root of the documentation.
> > @@ -419,3 +413,11 @@ pdf_documents = [
> > # line arguments.
> > kerneldoc_bin = '../scripts/kernel-doc'
> > kerneldoc_srctree = '..'
> > +
> > +
> > +def setup(app):
> > + """
> > + This is a basic Sphinx extension that adds our CSS overrides.
> > + """
> > + app.add_stylesheet('_static/theme_overrides.css')
>
> Hmm, this will not work, Since the '_static' folder is not needed
> to name here. As far as I know, with
>
> html_static_path = ['sphinx-static']
>
> everything from the 'sphinx-static' is copied to HTML builder's
> '_static' folder. And a (corrected)
>
> app.add_stylesheet('theme_overrides.css')
>
> will insert a:
>
> <link rel="stylesheet" href="_static/theme_overrides.css" type="text/css" />
>
> in the HTML header of the builder (the '_static' folder is added by the HTML
> builder).
>
> Anyway, let me say thanks ... and it would be great if you add
> more of your value to the ML ;-)
I feel silly now! I actually only tested it on Read the Docs, where I
set up a project building from my remote on GitHub. This had the
correct styles working again, but you're correct that it is actually
404'ing on the ``_static/_static/theme_override.css``.
I've updated my patch on my remote to have the correct line, and it's
working correctly now: http://kernel-mirror.readthedocs.io/en/latest/
-- it has the correct HTML:
<link rel="stylesheet" href="_static/theme_overrides.css" type="text/css" />
I'm happy to resend the whole patch, or feel free to simply edit my
original with your suggested
``app.add_stylesheet('theme_overrides.css')`` line.
Cheers,
Eric
--
Eric Holscher
Maker of the internet residing in Portland, Oregon
http://ericholscher.com
--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
