diff --git a/_doc/sphinxdoc/source/conf.py b/_doc/sphinxdoc/source/conf.py index 98d657e1c..0a84bc4aa 100644 --- a/_doc/sphinxdoc/source/conf.py +++ b/_doc/sphinxdoc/source/conf.py @@ -28,5 +28,9 @@ nbneg_pattern = ".*[\\\\/]temp_.*" html_context = { - 'css_files': get_default_stylesheet(['_static/my-styles.css', '_static/gallery.css']), + 'css_files': get_default_stylesheet([ + '_static/my-styles.css', + '_static/gallery.css', + '_static/gallery-dataframe.css', + ]), } diff --git a/_doc/sphinxdoc/source/phdoc_static/my-styles.css b/_doc/sphinxdoc/source/phdoc_static/my-styles.css index 16308d838..936932c84 100644 --- a/_doc/sphinxdoc/source/phdoc_static/my-styles.css +++ b/_doc/sphinxdoc/source/phdoc_static/my-styles.css @@ -16,35 +16,6 @@ div.body li { line-height: 1.2em; } -.wy-nav-top { - background-color: #FF0040; -} - -.wy-side-nav-search { - background-color: #FF0040; -} - pre.highlight-default { background-color: #b5b5b5; } - -table { - border: solid 1px #DDEEEE; - border-collapse: collapse; - border-spacing: 0; - font: normal 13px Arial, sans-serif; -} -thead th { - background-color: #DDEFEF; - border: solid 1px #DDEEEE; - color: #336B6B; - padding: 10px; - text-align: left; - text-shadow: 1px 1px 1px #fff; -} -tbody td { - border: solid 1px #DDEEEE; - color: #333; - padding: 10px; - text-shadow: 1px 1px 1px #fff; -} diff --git a/_doc/sphinxdoc/source/phdoc_static/solar.css b/_doc/sphinxdoc/source/phdoc_static/solar.css deleted file mode 100644 index 86fa92b61..000000000 --- a/_doc/sphinxdoc/source/phdoc_static/solar.css +++ /dev/null @@ -1,339 +0,0 @@ -/* solar.css - * Modified from sphinxdoc.css of the sphinxdoc theme. -*/ - -@import url("basic.css"); - -/* -- page layout ----------------------------------------------------------- */ - -body { - font-family: 'Open Sans', sans-serif; - font-size: 14px; - line-height: 150%; - text-align: center; - color: #002b36; - padding: 0; - margin: 0px 80px 0px 80px; - min-width: 740px; - -moz-box-shadow: 0px 0px 10px #93a1a1; - -webkit-box-shadow: 0px 0px 10px #93a1a1; - box-shadow: 0px 0px 10px #93a1a1; - background: url("subtle_dots.png") repeat; - -} - -div.document { - background-color: #fcfcfc; - text-align: left; - background-repeat: repeat-x; -} - -div.bodywrapper { - margin: 0 240px 0 0; - border-right: 1px dotted #eee8d5; -} - -div.body { - background-color: white; - margin: 0; - padding: 0.5em 20px 20px 20px; -} - -div.related { - font-size: 1em; - background: #002b36; - color: #839496; - padding: 5px 0px; -} - -div.related ul { - height: 2em; - margin: 2px; -} - -div.related ul li { - margin: 0; - padding: 0; - height: 2em; - float: left; -} - -div.related ul li.right { - float: right; - margin-right: 5px; -} - -div.related ul li a { - margin: 0; - padding: 2px 5px; - line-height: 2em; - text-decoration: none; - color: #839496; -} - -div.related ul li a:hover { - background-color: #073642; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} - -div.sphinxsidebarwrapper { - padding: 0; -} - -div.sphinxsidebar { - margin: 0; - padding: 0.5em 15px 15px 0; - width: 210px; - float: right; - font-size: 0.9em; - text-align: left; -} - -div.sphinxsidebar h3, div.sphinxsidebar h4 { - margin: 1em 0 0.5em 0; - font-size: 1em; - padding: 0.7em; - background-color: #eeeff1; -} - -div.sphinxsidebar h3 a { - color: #2E3436; -} - -div.sphinxsidebar ul { - padding-left: 1.5em; - margin-top: 7px; - padding: 0; - line-height: 150%; - color: #586e75; -} - -div.sphinxsidebar ul ul { - margin-left: 20px; -} - -div.sphinxsidebar input { - border: 1px solid #eee8d5; -} - -div.footer { - background-color: #93a1a1; - color: #eee; - padding: 3px 8px 3px 0; - clear: both; - font-size: 0.8em; - text-align: right; -} - -div.footer a { - color: #eee; - text-decoration: none; -} - -/* -- body styles ----------------------------------------------------------- */ - -p { - margin: 0.8em 0 0.5em 0; -} - -div.body a, div.sphinxsidebarwrapper a { - color: #268bd2; - text-decoration: none; -} - -div.body a:hover, div.sphinxsidebarwrapper a:hover { - border-bottom: 1px solid #268bd2; -} - -h1, h2, h3, h4, h5, h6 { - font-family: "Open Sans", sans-serif; - font-weight: 300; -} - -h1 { - margin: 0; - padding: 0.7em 0 0.3em 0; - line-height: 1.2em; - color: #002b36; - text-shadow: #eee 0.1em 0.1em 0.1em; -} - -h2 { - margin: 1.3em 0 0.2em 0; - padding: 0 0 10px 0; - color: #073642; - border-bottom: 1px solid #eee; -} - -h3 { - margin: 1em 0 -0.3em 0; - padding-bottom: 5px; -} - -h3, h4, h5, h6 { - color: #073642; - border-bottom: 1px dotted #eee; -} - -div.body h1 a, div.body h2 a, div.body h3 a, div.body h4 a, div.body h5 a, div.body h6 a { - color: #657B83!important; -} - -h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor { - display: none; - margin: 0 0 0 0.3em; - padding: 0 0.2em 0 0.2em; - color: #aaa!important; -} - -h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, -h5:hover a.anchor, h6:hover a.anchor { - display: inline; -} - -h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover, -h5 a.anchor:hover, h6 a.anchor:hover { - color: #777; - background-color: #eee; -} - -a.headerlink { - color: #c60f0f!important; - font-size: 1em; - margin-left: 6px; - padding: 0 4px 0 4px; - text-decoration: none!important; -} - -a.headerlink:hover { - background-color: #ccc; - color: white!important; -} - - -cite, code, tt { - font-family: 'Source Code Pro', monospace; - font-size: 0.9em; - letter-spacing: 0.01em; - background-color: #eeeff2; - font-style: normal; -} - -hr { - border: 1px solid #eee; - margin: 2em; -} - -.highlight { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} - -pre { - font-family: 'Source Code Pro', monospace; - font-style: normal; - font-size: 0.9em; - letter-spacing: 0.015em; - line-height: 120%; - padding: 0.7em; - white-space: pre-wrap; /* css-3 */ - white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ -} - -pre a { - color: inherit; - text-decoration: underline; -} - -td.linenos pre { - padding: 0.5em 0; -} - -div.quotebar { - background-color: #f8f8f8; - max-width: 250px; - float: right; - padding: 2px 7px; - border: 1px solid #ccc; -} - -div.topic { - background-color: #f8f8f8; -} - -table { - border-collapse: collapse; - margin: 0 -0.5em 0 -0.5em; -} - -table td, table th { - padding: 0.2em 0.5em 0.2em 0.5em; -} - -div.admonition { - font-size: 0.9em; - margin: 1em 0 1em 0; - border: 1px solid #eee; - background-color: #f7f7f7; - padding: 0; - -moz-box-shadow: 0px 8px 6px -8px #93a1a1; - -webkit-box-shadow: 0px 8px 6px -8px #93a1a1; - box-shadow: 0px 8px 6px -8px #93a1a1; -} - -div.admonition p, div.admonition div.highlight { - margin: 0.5em 1em 0.5em 1em; -} - -div.admonition p.admonition-title -{ - margin: 0; - padding: 0.2em 0 0.2em 0.6em; - color: white; - border-bottom: 1px solid #eee8d5; - font-weight: bold; - background-color: #268bd2; -} - -div.warning p.admonition-title, -div.important p.admonition-title { - background-color: #cb4b16; -} - -div.hint p.admonition-title, -div.tip p.admonition-title { - background-color: #859900; -} - -div.caution p.admonition-title, -div.attention p.admonition-title, -div.danger p.admonition-title, -div.error p.admonition-title { - background-color: #dc322f; -} - -div.admonition ul, div.admonition ol { - margin: 0.1em 0.5em 0.5em 3em; - padding: 0; -} - -div.versioninfo { - margin: 1em 0 0 0; - border: 1px solid #eee; - background-color: #DDEAF0; - padding: 8px; - line-height: 1.3em; - font-size: 0.9em; -} - -div.viewcode-block:target { - background-color: #f4debf; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; -} diff --git a/_doc/sphinxdoc/source/phdoc_static/solarized-dark.css b/_doc/sphinxdoc/source/phdoc_static/solarized-dark.css deleted file mode 100644 index a566d43ce..000000000 --- a/_doc/sphinxdoc/source/phdoc_static/solarized-dark.css +++ /dev/null @@ -1,84 +0,0 @@ -/* solarized dark style for solar theme */ - -/*style pre scrollbar*/ -pre::-webkit-scrollbar, .highlight::-webkit-scrollbar { - height: 0.5em; - background: #073642; -} - -pre::-webkit-scrollbar-thumb { - border-radius: 1em; - background: #C3C1C1; -} - -/* pygments style */ -.highlight .hll { background-color: #ffffcc } -.highlight { background: #204B56!important; color: #C3C1C1 } -.highlight .c { color: #586E75 } /* Comment */ -.highlight .err { color: #C3C1C1 } /* Error */ -.highlight .g { color: #C3C1C1 } /* Generic */ -.highlight .k { color: #859900 } /* Keyword */ -.highlight .l { color: #C3C1C1 } /* Literal */ -.highlight .n { color: #C3C1C1 } /* Name */ -.highlight .o { color: #859900 } /* Operator */ -.highlight .x { color: #CB4B16 } /* Other */ -.highlight .p { color: #C3C1C1 } /* Punctuation */ -.highlight .cm { color: #586E75 } /* Comment.Multiline */ -.highlight .cp { color: #859900 } /* Comment.Preproc */ -.highlight .c1 { color: #586E75 } /* Comment.Single */ -.highlight .cs { color: #859900 } /* Comment.Special */ -.highlight .gd { color: #2AA198 } /* Generic.Deleted */ -.highlight .ge { color: #C3C1C1; font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #DC322F } /* Generic.Error */ -.highlight .gh { color: #CB4B16 } /* Generic.Heading */ -.highlight .gi { color: #859900 } /* Generic.Inserted */ -.highlight .go { color: #C3C1C1 } /* Generic.Output */ -.highlight .gp { color: #C3C1C1 } /* Generic.Prompt */ -.highlight .gs { color: #C3C1C1; font-weight: bold } /* Generic.Strong */ -.highlight .gu { color: #CB4B16 } /* Generic.Subheading */ -.highlight .gt { color: #C3C1C1 } /* Generic.Traceback */ -.highlight .kc { color: #CB4B16 } /* Keyword.Constant */ -.highlight .kd { color: #268BD2 } /* Keyword.Declaration */ -.highlight .kn { color: #859900 } /* Keyword.Namespace */ -.highlight .kp { color: #859900 } /* Keyword.Pseudo */ -.highlight .kr { color: #268BD2 } /* Keyword.Reserved */ -.highlight .kt { color: #DC322F } /* Keyword.Type */ -.highlight .ld { color: #C3C1C1 } /* Literal.Date */ -.highlight .m { color: #2AA198 } /* Literal.Number */ -.highlight .s { color: #2AA198 } /* Literal.String */ -.highlight .na { color: #C3C1C1 } /* Name.Attribute */ -.highlight .nb { color: #B58900 } /* Name.Builtin */ -.highlight .nc { color: #268BD2 } /* Name.Class */ -.highlight .no { color: #CB4B16 } /* Name.Constant */ -.highlight .nd { color: #268BD2 } /* Name.Decorator */ -.highlight .ni { color: #CB4B16 } /* Name.Entity */ -.highlight .ne { color: #CB4B16 } /* Name.Exception */ -.highlight .nf { color: #268BD2 } /* Name.Function */ -.highlight .nl { color: #C3C1C1 } /* Name.Label */ -.highlight .nn { color: #C3C1C1 } /* Name.Namespace */ -.highlight .nx { color: #C3C1C1 } /* Name.Other */ -.highlight .py { color: #C3C1C1 } /* Name.Property */ -.highlight .nt { color: #268BD2 } /* Name.Tag */ -.highlight .nv { color: #268BD2 } /* Name.Variable */ -.highlight .ow { color: #859900 } /* Operator.Word */ -.highlight .w { color: #C3C1C1 } /* Text.Whitespace */ -.highlight .mf { color: #2AA198 } /* Literal.Number.Float */ -.highlight .mh { color: #2AA198 } /* Literal.Number.Hex */ -.highlight .mi { color: #2AA198 } /* Literal.Number.Integer */ -.highlight .mo { color: #2AA198 } /* Literal.Number.Oct */ -.highlight .sb { color: #586E75 } /* Literal.String.Backtick */ -.highlight .sc { color: #2AA198 } /* Literal.String.Char */ -.highlight .sd { color: #C3C1C1 } /* Literal.String.Doc */ -.highlight .s2 { color: #2AA198 } /* Literal.String.Double */ -.highlight .se { color: #CB4B16 } /* Literal.String.Escape */ -.highlight .sh { color: #C3C1C1 } /* Literal.String.Heredoc */ -.highlight .si { color: #2AA198 } /* Literal.String.Interpol */ -.highlight .sx { color: #2AA198 } /* Literal.String.Other */ -.highlight .sr { color: #DC322F } /* Literal.String.Regex */ -.highlight .s1 { color: #2AA198 } /* Literal.String.Single */ -.highlight .ss { color: #2AA198 } /* Literal.String.Symbol */ -.highlight .bp { color: #268BD2 } /* Name.Builtin.Pseudo */ -.highlight .vc { color: #268BD2 } /* Name.Variable.Class */ -.highlight .vg { color: #268BD2 } /* Name.Variable.Global */ -.highlight .vi { color: #268BD2 } /* Name.Variable.Instance */ -.highlight .il { color: #2AA198 } /* Literal.Number.Integer.Long */ diff --git a/src/pyquickhelper/helpgen/default_conf.py b/src/pyquickhelper/helpgen/default_conf.py index 7680114e3..031a41492 100644 --- a/src/pyquickhelper/helpgen/default_conf.py +++ b/src/pyquickhelper/helpgen/default_conf.py @@ -735,13 +735,9 @@ def set_sphinx_variables(fileconf, module_name, author, year, theme, theme_path, 'http://www.xavierdupre.fr/app/pyquickhelper/helpsphinx/', None), 'python': ('https://docs.python.org/{.major}'.format( sys.version_info), None), - 'scikit-learn': ( - 'https://scikit-learn.org/stable/', - None), + 'scikit-learn': ('https://scikit-learn.org/stable/', None), 'scipy': ('https://docs.scipy.org/doc/scipy/reference', None), - 'sklearn': ( - 'https://scikit-learn.org/stable/', - None), + 'sklearn': ('https://scikit-learn.org/stable/', None), } # information about code @@ -818,7 +814,7 @@ def modify_commit_function(nbch, date, author, comment): 'backreferences_dir': example_dir, 'expected_failing_examples': [], 'capture_repr': ('_repr_html_', '__repr__'), - 'ignore_repr_types': r'matplotlib.text|matplotlib.axes', + 'ignore_repr_types': r'matplotlib[text, axes]', 'inspect_global_variables': False, 'remove_config_comments': True, } @@ -1021,11 +1017,10 @@ def get_default_stylesheet(css=None): # delayed import to speed up time from sphinx.builders.html import Stylesheet rel = "_static/" + style_figure_notebook[0] - res = [Stylesheet(rel="stylesheet", title="style_figure_notebook", filename=rel)] + res = [Stylesheet(rel="stylesheet", filename=rel)] if css is not None: for cs in css: - res.append(Stylesheet(rel="stylesheet", title=os.path.split(cs)[-1], - filename=cs)) + res.append(Stylesheet(rel="stylesheet", filename=cs)) return res