From 3334c06e8b7f449e6257e8c74df65279859a2c30 Mon Sep 17 00:00:00 2001 From: Dmitriy Anisimov Date: Sat, 30 Aug 2014 12:55:45 +0400 Subject: [PATCH 1/5] initial commit --- doc/_themes/sphinxdoc/layout.html | 274 +++++++++++ doc/_themes/sphinxdoc/static/bodybg.png | Bin 0 -> 513 bytes doc/_themes/sphinxdoc/static/default.css_t | 541 +++++++++++++++++++++ doc/_themes/sphinxdoc/static/footerbg.png | Bin 0 -> 220 bytes doc/_themes/sphinxdoc/static/headerbg.png | Bin 0 -> 230 bytes doc/_themes/sphinxdoc/static/listitem.png | Bin 0 -> 207 bytes doc/_themes/sphinxdoc/static/relbg.png | Bin 0 -> 223 bytes doc/_themes/sphinxdoc/theme.conf | 4 + doc/conf.py | 4 +- 9 files changed, 821 insertions(+), 2 deletions(-) create mode 100644 doc/_themes/sphinxdoc/layout.html create mode 100644 doc/_themes/sphinxdoc/static/bodybg.png create mode 100644 doc/_themes/sphinxdoc/static/default.css_t create mode 100644 doc/_themes/sphinxdoc/static/footerbg.png create mode 100644 doc/_themes/sphinxdoc/static/headerbg.png create mode 100644 doc/_themes/sphinxdoc/static/listitem.png create mode 100644 doc/_themes/sphinxdoc/static/relbg.png create mode 100644 doc/_themes/sphinxdoc/theme.conf diff --git a/doc/_themes/sphinxdoc/layout.html b/doc/_themes/sphinxdoc/layout.html new file mode 100644 index 000000000..c359d4084 --- /dev/null +++ b/doc/_themes/sphinxdoc/layout.html @@ -0,0 +1,274 @@ +{# + basic/layout.html + ~~~~~~~~~~~~~~~~~ + + Master layout template for Sphinx themes. + + :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS. + :license: BSD, see LICENSE for details. +#} +{%- block doctype -%} + +{%- endblock %} +{% set script_files = script_files + [pathto("_static/insertIframe.js", 1)] %} +{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %} +{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %} +{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and + (sidebars != []) %} +{%- set url_root = pathto('', 1) %} +{# XXX necessary? #} +{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} +{%- if not embedded and docstitle %} + {%- set titlesuffix = " — "|safe + docstitle|e %} +{%- else %} + {%- set titlesuffix = "" %} +{%- endif %} + +{%- macro relbar() %} + +{%- endmacro %} + +{%- macro sidebar() %} + {%- if render_sidebar %} +
+
+ {%- block sidebarlogo %} + {%- if logo %} + + {%- endif %} + {%- endblock %} + {%- if sidebars == None %} + {%- block sidebarsearch %} + {%- include "searchbox.html" %} + {%- endblock %} + {%- endif %} + {%- if sidebars != None %} + {#- new style sidebar: explicitly include/exclude templates #} + {%- for sidebartemplate in sidebars %} + {%- include sidebartemplate %} + {%- endfor %} + {%- else %} + {#- old style sidebars: using blocks -- should be deprecated #} + {%- block sidebartoc %} + {%- include "localtoc.html" %} + {%- endblock %} + {%- block sidebarrel %} + {%- include "relations.html" %} + {%- endblock %} + {%- if customsidebar %} + {%- include customsidebar %} + {%- endif %} + {%- endif %} +
+
+ {%- endif %} +{%- endmacro %} + +{%- macro script() %} + + {%- for scriptfile in script_files %} + + {%- endfor %} +{%- endmacro %} + +{%- macro css() %} + + + {%- for cssfile in css_files %} + + {%- endfor %} +{%- endmacro %} + + + + + {{ metatags }} + {%- block htmltitle %} + {{ title|striptags|e }}{{ titlesuffix }} + {%- endblock %} + {{ css() }} + {%- if not embedded %} + {{ script() }} + {%- if use_opensearch %} + + {%- endif %} + {%- if favicon %} + + {%- endif %} + {%- endif %} +{%- block linktags %} + {%- if hasdoc('about') %} + + {%- endif %} + {%- if hasdoc('genindex') %} + + {%- endif %} + {%- if hasdoc('search') %} + + {%- endif %} + {%- if hasdoc('copyright') %} + + {%- endif %} + + {%- if parents %} + + {%- endif %} + {%- if next %} + + {%- endif %} + {%- if prev %} + + {%- endif %} +{%- endblock %} +{%- block extrahead %} + +{%- if not embedded %} + + +{%- endif %} +{% endblock %} + +{%- block header %}{% endblock %} + +{%- block relbar1 %}{{ relbar() }}{% endblock %} + + {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %} + {%- block sidebar2 %}{{ sidebar() }}{% endblock %} + + +{%- block content %} + +
+ {%- block document %} +
+ {%- if render_sidebar %} +
+ {%- endif %} +
+ {% block body %} {% endblock %} +
+ + {%- if render_sidebar %} +
+ {%- endif %} +
+ {%- endblock %} + +
+
+{%- endblock %} + +{%- block relbar2 %}{{ relbar() }}{% endblock %} + +{%- block footer %} + +{%- endblock %} + + diff --git a/doc/_themes/sphinxdoc/static/bodybg.png b/doc/_themes/sphinxdoc/static/bodybg.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe92f66911ffc6a22a84b11ee8ad62b4b59cb03 GIT binary patch literal 513 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQaoCO|{#X$M%Ak65bF}ngN$X?>< z>&kwYQIMURA&{#$6euK{84^+AoS&PUnpXnkGB7w7r6!i7rYMwWmSiZnd-?{X=%um) z#WMqZLR^3Rc=zMS`=397=)=#SAAkP*^z-NEU%x*6`UNDv{QC9v_wO&ie*?*Hzkh%K z{rktCKi~fR`Tpk*kn!`+pI?9f{`mVBNdEr&_s_q7zyAIE{qG-;@%JAH{Qv*|&;S2_ z|NjTEmVOj@z`(%BY@#4Be3OsBNk{sLmtgK~rE$Z9%-&ro=N_X+s_9dD7 z#T@o$O7i-JZZ`h0;uMEn$C``PlfDc6DHKfPpKbB_`L2ye6{0O8m+*$H+35M2*Hep*$&tKAhf4(ShD(f+e44U=WqR7jp>0{`8UA3z@jNzeX7d*C3e&n~Q zQr-86`7+J8sF>S}kFtd7e0zCkS@*RD_Eih=O=g7Tv$f4-Su$a|z@a(D?TX9hBy&tT z$g250<8G)I*E#*58>W}ODQ|7A@i>0TBV*;YHybD3@~F^R{_xD}d&QB_=NskbZjpcD wZZua#{u1N9@Sp^>tm>NPsxNor|L=dyzt~PHh}m4}3Mg(oUHx3vIVCg!06iH8I{*Lx literal 0 HcmV?d00001 diff --git a/doc/_themes/sphinxdoc/static/default.css_t b/doc/_themes/sphinxdoc/static/default.css_t new file mode 100644 index 000000000..bca6eb154 --- /dev/null +++ b/doc/_themes/sphinxdoc/static/default.css_t @@ -0,0 +1,541 @@ +/* + * sphinx13.css + * ~~~~~~~~~~~~ + * + * Sphinx stylesheet -- sphinx13 theme. + * + * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ + +@import url("basic.css"); + +/* -- page layout ----------------------------------------------------------- */ + +body { + font-family: 'Open Sans', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', + 'Verdana', sans-serif; + font-size: 14px; + text-align: center; + background-image: url(bodybg.png); + color: black; + padding: 0; + border-right: 1px solid #0a507a; + border-left: 1px solid #0a507a; + + margin: 0 auto; + min-width: 780px; + max-width: 1080px; +} + +.pageheader { + background-image: url(headerbg.png); + text-align: left; + padding: 10px 15px; +} + +.pageheader ul { + float: right; + color: white; + list-style-type: none; + padding-left: 0; + margin-top: 30px; + margin-right: 10px; +} + +.pageheader li { + float: left; + margin: 0 0 0 10px; +} + +.pageheader li a { + border-radius: 1px; + padding: 8px 12px; + color: #f9f9f0; + text-shadow: 0 0 5px rgba(0, 0, 0, 0.5); +} + +.pageheader li a:hover { + background-color: #f9f9f0; + color: #0a507a; + text-shadow: none; +} + +div.document { + background-color: white; + text-align: left; +} + +div.bodywrapper { + margin: 0 240px 0 0; + border-right: 1px solid #0a507a; +} + +div.body { + margin: 0; + padding: 0.5em 20px 20px 20px; +} + +div.related { + font-size: 1em; + color: white; +} + +div.related ul { + background-image: url(relbg.png); + height: 1.9em; + border-top: 1px solid #002e50; + border-bottom: 1px solid #002e50; +} + +div.related ul li { + margin: 0 5px 0 0; + padding: 0; + float: left; +} + +div.related ul li.right { + float: right; + margin-right: 5px; +} + +div.related ul li a { + margin: 0; + padding: 0 5px 0 5px; + line-height: 1.75em; + color: #f9f9f0; + text-shadow: 0px 0px 1px rgba(0, 0, 0, 0.5); +} + +div.related ul li a:hover { + color: white; + /*text-decoration: underline;*/ + text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5); +} + +div.sphinxsidebarwrapper { + position: relative; + top: 0px; + padding: 0; +} + +div.sphinxsidebar { + word-wrap: break-word; + margin: 0; + padding: 0 15px 15px 0; + width: 210px; + float: right; + font-size: 1em; + text-align: left; +} + +div.sphinxsidebar .logo { + font-size: 1.8em; + color: #0A507A; + font-weight: 300; + text-align: center; +} + +div.sphinxsidebar .logo img { + vertical-align: middle; +} + +div.sphinxsidebar input { + border: 1px solid #aaa; + font-family: 'Open Sans', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', + 'Verdana', sans-serif; + font-size: 1em; +} + +div.sphinxsidebar h3 { + font-size: 1.5em; + border-top: 1px solid #0a507a; + margin-top: 1em; + margin-bottom: 0.5em; + padding-top: 0.5em; +} + +div.sphinxsidebar h4 { + font-size: 1.2em; + margin-bottom: 0; +} + +div.sphinxsidebar h3, div.sphinxsidebar h4 { + margin-right: -15px; + margin-left: -15px; + padding-right: 14px; + padding-left: 14px; + color: #333; + font-weight: 300; + /*text-shadow: 0px 0px 0.5px rgba(0, 0, 0, 0.4);*/ +} + +div.sphinxsidebarwrapper > h3:first-child { + margin-top: 0.5em; + border: none; +} + +div.sphinxsidebar h3 a { + color: #333; +} + +div.sphinxsidebar ul { + color: #444; + margin-top: 7px; + padding: 0; + line-height: 130%; +} + +div.sphinxsidebar ul ul { + margin-left: 20px; + list-style-image: url(listitem.png); +} + +div.footer { + background-image: url(footerbg.png); + color: #ccc; + text-shadow: 0 0 .2px rgba(255, 255, 255, 0.8); + padding: 3px 8px 3px 0; + clear: both; + font-size: 0.8em; + text-align: right; +} + +/* -- body styles ----------------------------------------------------------- */ + +p { + margin: 0.8em 0 0.5em 0; +} + +a { + color: #A2881D; + text-decoration: none; +} + +a:hover { + color: #E1C13F; +} + +div.body a { + text-decoration: underline; +} + +h1 { + margin: 10px 0 0 0; + font-size: 2.4em; + color: #0A507A; + font-weight: 300; +} + +h2 { + margin: 1.em 0 0.2em 0; + font-size: 1.5em; + font-weight: 300; + padding: 0; + color: #174967; +} + +h3 { + margin: 1em 0 -0.3em 0; + font-size: 1.3em; + font-weight: 300; +} + +div.body h1 a, div.body h2 a, div.body h3 a, div.body h4 a, div.body h5 a, div.body h6 a { + text-decoration: none; +} + +div.body h1 a tt, div.body h2 a tt, div.body h3 a tt, div.body h4 a tt, div.body h5 a tt, div.body h6 a tt { + color: #0A507A !important; + font-size: inherit !important; +} + +a.headerlink { + color: #0A507A !important; + font-size: 12px; + margin-left: 6px; + padding: 0 4px 0 4px; + text-decoration: none !important; + float: right; +} + +a.headerlink:hover { + background-color: #ccc; + color: white!important; +} + +cite, code, tt { + font-family: 'Consolas', 'DejaVu Sans Mono', + 'Bitstream Vera Sans Mono', monospace; + font-size: 14px; + letter-spacing: -0.02em; +} + +tt { + background-color: #f2f2f2; + border: 1px solid #ddd; + border-radius: 2px; + color: #333; + padding: 1px; +} + +tt.descname, tt.descclassname, tt.xref { + border: 0; +} + +hr { + border: 1px solid #abc; + margin: 2em; +} + +a tt { + border: 0; + color: #a2881d; +} + +a tt:hover { + color: #e1c13f; +} + +pre { + font-family: 'Consolas', 'DejaVu Sans Mono', + 'Bitstream Vera Sans Mono', monospace; + font-size: 13px; + letter-spacing: 0.015em; + line-height: 120%; + padding: 0.5em; + border: 1px solid #ccc; + border-radius: 2px; + background-color: #f8f8f8; +} + +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: 0px 7px; + border: 1px solid #ccc; + margin-left: 1em; +} + +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, div.warning { + font-size: 0.9em; + margin: 1em 0 1em 0; + border: 1px solid #86989B; + border-radius: 2px; + background-color: #f7f7f7; + padding: 0; +} + +div.admonition p, div.warning p { + margin: 0.5em 1em 0.5em 1em; + padding: 0; +} + +div.admonition pre, div.warning pre { + margin: 0.4em 1em 0.4em 1em; +} + +div.admonition p.admonition-title, +div.warning p.admonition-title { + margin-top: 1em; + padding-top: 0.5em; + font-weight: bold; +} + +div.warning { + border: 1px solid #940000; +/* background-color: #FFCCCF;*/ +} + +div.warning p.admonition-title { +} + +div.admonition ul, div.admonition ol, +div.warning ul, div.warning ol { + margin: 0.1em 0.5em 0.5em 3em; + padding: 0; +} + +.viewcode-back { + font-family: 'Open Sans', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', + 'Verdana', sans-serif; +} + +div.viewcode-block:target { + background-color: #f4debf; + border-top: 1px solid #ac9; + border-bottom: 1px solid #ac9; +} + +/* ------------------ our styles ----------------*/ + +div.body p, div.body dd, div.body li { + text-align: justify; + line-height: 130%; + margin-top: 1em; + margin-bottom: 1em; +} + +div.toctree-wrapper li, ul.simple li { + margin:0; +} + +a.toc-backref, a.toc-backref:hover { + font-family: {{ theme_headfont }}; + background-color: {{ theme_headbgcolor }}; + font-weight: normal; + color: {{ theme_headtextcolor }}; + text-decoration: none; +} + +div.feedback { + background-color: {{ theme_feedbackbgcolor }}; + color: {{ theme_feedbacktextcolor }}; + padding: 20px 20px 30px 20px; +} + +div.feedback h2 { + margin: 10px 0 10px 0; +} + +div.feedback a { + color: {{ theme_feedbacklinkcolor }}; + font-weight: bold; +} + +img.logo { + width: 150px; +} + +tt, tt.descname { + color: {{ theme_headtextcolor }}; + /*background-color: #ecf0f3;*/ + padding: 0 1px 0 1px; + font-size: 1.4em; +} + +div.math p { + margin-top: 10px; + margin-bottom: 10px; +} + +dl.function > dt:first-child { + margin-bottom: 7px; +} + +dl.cfunction > dt:first-child { + margin-bottom: 7px; + color: #8080B0; +} + +dl.cfunction > dt:first-child tt.descname +{ + color: #8080B0; +} + + +dl.pyfunction > dt:first-child { + margin-bottom: 7px; +} + +dl.jfunction > dt:first-child { + margin-bottom: 7px; +} + +table.field-list { + margin-top: 20px; +} + +/*ul.simple { + list-style: none; +}*/ + +em.menuselection, em.guilabel { + font-family: {{ theme_guifont }}; +} + +.enumeratevisibleitemswithsquare ul { +list-style: square; +margin-bottom: 0px; +margin-left: 0px; +margin-right: 0px; +margin-top: 0px; +} + +.enumeratevisibleitemswithsquare li { +margin-bottom: 0.2em; +margin-left: 0px; +margin-right: 0px; +margin-top: 0.2em; + } + + .enumeratevisibleitemswithsquare p { + margin-bottom: 0pt; + margin-top: 1pt; + } + + .enumeratevisibleitemswithsquare dl{ +margin-bottom: 0px; +margin-left: 0px; +margin-right: 0px; +margin-top: 0px; + } + + .toctableopencv + { + width: 100% ; + table-layout: fixed; + } + + .toctableopencv colgroup col:first-child + { + width: 100pt !important; + max-width: 100pt !important; + min-width: 100pt !important; + } + + .toctableopencv colgroup col:nth-child(2) + { + width: 100% !important; + } + +div.body ul.search li { + text-align: left; +} + +div.linenodiv { + min-width: 1em; + text-align: right; +} + +div.sphinxsidebar #searchbox input[type="text"] { + width:auto; +} + +div.sphinxsidebar #searchbox input[type="submit"] { + width:auto; +} diff --git a/doc/_themes/sphinxdoc/static/footerbg.png b/doc/_themes/sphinxdoc/static/footerbg.png new file mode 100644 index 0000000000000000000000000000000000000000..df783e2c76c8c35bce0860368ba66bd6f398ef08 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs&H|6fVxatW5N34Jm|X!BWH0gb zb!ETH$S-0fTsp033s6Wjz$e6&RmX)*&z()*gU!I3&B%w%*pJQF|LP_uTcCm{PZ!4! zj_BkB9`2L^??eG#(FB2_LLrkvv5>;R6pq9MPSFIO(u9IkkHiE|AhS53z*)>Ss5^xz zIYXg2o1-~n1w-@Z1sl2-P3T^@fO8Y4hmQ)Y$E_7FWf*pyP;zBX=7|T|!rxj3-^ literal 0 HcmV?d00001 diff --git a/doc/_themes/sphinxdoc/static/headerbg.png b/doc/_themes/sphinxdoc/static/headerbg.png new file mode 100644 index 0000000000000000000000000000000000000000..22830f99ef36d9b697e205470f09985bd3a5219a GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs&H|6fVxatW5N34Jm|X!BWH0gb zb!ETH$S0;{@^ZgSFHlG>z$e6&!zF{mC6mJ?i_<-q(=(sbyO`6rlq;ZuE1;4qpench z!epSzXipc%5RT~Ngm*bU?R>KV* z=4aNGv&UGh(5%v^3ic2_Tqf;9+ScrKuZn^uU2H zQyfn*9&-yU`CQ%jRM<_jbEVs=+4%-On`#az=vrO%C^ha<()jUzeq*EHImaYp10cwd vh@M+!5EQwitFh7Z?ulO_J-(9;uViOPP?5c=x_{|>pv?@Pu6{1-oD!M<&SgTz literal 0 HcmV?d00001 diff --git a/doc/_themes/sphinxdoc/static/relbg.png b/doc/_themes/sphinxdoc/static/relbg.png new file mode 100644 index 0000000000000000000000000000000000000000..2006af7d2ac133a955f06828d0727f5a5519a9dd GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs&H|6fVxatW5N34Jm|X!BWH0gb zb!ETH$Sg)3ms3ywO z#W92H9$K!A%KrJtcW+zh}Sg9LsY;wIKhiMg(q1fH9;51 Date: Sun, 31 Aug 2014 18:12:34 +0400 Subject: [PATCH 2/5] slight changes, theme become more similar with current --- doc/_themes/sphinxdoc/layout.html | 2 +- doc/_themes/sphinxdoc/searchbox.html | 21 +++++ doc/_themes/sphinxdoc/static/default.css_t | 93 +++++++++------------- 3 files changed, 61 insertions(+), 55 deletions(-) create mode 100644 doc/_themes/sphinxdoc/searchbox.html diff --git a/doc/_themes/sphinxdoc/layout.html b/doc/_themes/sphinxdoc/layout.html index c359d4084..106452767 100644 --- a/doc/_themes/sphinxdoc/layout.html +++ b/doc/_themes/sphinxdoc/layout.html @@ -266,7 +266,7 @@ {% trans sphinx_version=sphinx_version|e %}Created using Sphinx {{ sphinx_version }}.{% endtrans %} {%- endif %} {%- if show_source and has_source and sourcename %} - {{ _('Show This Page Source') }} + {{ _('Show this page source.') }} {%- endif %} {%- endblock %} diff --git a/doc/_themes/sphinxdoc/searchbox.html b/doc/_themes/sphinxdoc/searchbox.html new file mode 100644 index 000000000..73616d9ed --- /dev/null +++ b/doc/_themes/sphinxdoc/searchbox.html @@ -0,0 +1,21 @@ +{# + basic/searchbox.html + ~~~~~~~~~~~~~~~~~~~~ + + Sphinx sidebar template: quick search box. + + :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS. + :license: BSD, see LICENSE for details. +#} +{%- if pagename != "search" and builder != "singlehtml" %} + + +{%- endif %} diff --git a/doc/_themes/sphinxdoc/static/default.css_t b/doc/_themes/sphinxdoc/static/default.css_t index bca6eb154..8b195de38 100644 --- a/doc/_themes/sphinxdoc/static/default.css_t +++ b/doc/_themes/sphinxdoc/static/default.css_t @@ -114,6 +114,16 @@ div.related ul li a:hover { text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5); } +div.footer { + background-image: url(footerbg.png); + color: #ccc; + text-shadow: 0 0 .2px rgba(255, 255, 255, 0.8); + padding: 3px 8px 3px 0; + clear: both; + font-size: 0.8em; + text-align: center; +} + div.sphinxsidebarwrapper { position: relative; top: 0px; @@ -192,16 +202,6 @@ div.sphinxsidebar ul ul { list-style-image: url(listitem.png); } -div.footer { - background-image: url(footerbg.png); - color: #ccc; - text-shadow: 0 0 .2px rgba(255, 255, 255, 0.8); - padding: 3px 8px 3px 0; - clear: both; - font-size: 0.8em; - text-align: right; -} - /* -- body styles ----------------------------------------------------------- */ p { @@ -416,6 +416,7 @@ div.feedback { background-color: {{ theme_feedbackbgcolor }}; color: {{ theme_feedbacktextcolor }}; padding: 20px 20px 30px 20px; + border-top: 1px solid #002e50; } div.feedback h2 { @@ -452,8 +453,7 @@ dl.cfunction > dt:first-child { color: #8080B0; } -dl.cfunction > dt:first-child tt.descname -{ +dl.cfunction > dt:first-child tt.descname { color: #8080B0; } @@ -470,58 +470,51 @@ table.field-list { margin-top: 20px; } -/*ul.simple { - list-style: none; -}*/ - em.menuselection, em.guilabel { font-family: {{ theme_guifont }}; } .enumeratevisibleitemswithsquare ul { -list-style: square; -margin-bottom: 0px; -margin-left: 0px; -margin-right: 0px; -margin-top: 0px; + list-style: square; + margin-bottom: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; } .enumeratevisibleitemswithsquare li { -margin-bottom: 0.2em; -margin-left: 0px; -margin-right: 0px; -margin-top: 0.2em; + margin-bottom: 0.2em; + margin-left: 0px; + margin-right: 0px; + margin-top: 0.2em; } - .enumeratevisibleitemswithsquare p { - margin-bottom: 0pt; - margin-top: 1pt; - } +.enumeratevisibleitemswithsquare p { + margin-bottom: 0pt; + margin-top: 1pt; +} - .enumeratevisibleitemswithsquare dl{ -margin-bottom: 0px; -margin-left: 0px; -margin-right: 0px; -margin-top: 0px; - } +.enumeratevisibleitemswithsquare dl { + margin-bottom: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; +} - .toctableopencv - { - width: 100% ; - table-layout: fixed; - } +.toctableopencv { + width: 100% ; + table-layout: fixed; +} - .toctableopencv colgroup col:first-child - { +.toctableopencv colgroup col:first-child { width: 100pt !important; max-width: 100pt !important; min-width: 100pt !important; - } +} - .toctableopencv colgroup col:nth-child(2) - { +.toctableopencv colgroup col:nth-child(2) { width: 100% !important; - } +} div.body ul.search li { text-align: left; @@ -531,11 +524,3 @@ div.linenodiv { min-width: 1em; text-align: right; } - -div.sphinxsidebar #searchbox input[type="text"] { - width:auto; -} - -div.sphinxsidebar #searchbox input[type="submit"] { - width:auto; -} From e7af509c86d61031b023839c3ae9d08a2a57f4a5 Mon Sep 17 00:00:00 2001 From: Dmitriy Anisimov Date: Wed, 3 Sep 2014 22:25:08 +0400 Subject: [PATCH 3/5] different enhancements --- doc/_themes/sphinxdoc/static/default.css_t | 158 ++++++--------------- 1 file changed, 45 insertions(+), 113 deletions(-) diff --git a/doc/_themes/sphinxdoc/static/default.css_t b/doc/_themes/sphinxdoc/static/default.css_t index 8b195de38..692f14162 100644 --- a/doc/_themes/sphinxdoc/static/default.css_t +++ b/doc/_themes/sphinxdoc/static/default.css_t @@ -1,8 +1,8 @@ /* - * sphinx13.css - * ~~~~~~~~~~~~ + * sphinxdoc.css_t + * ~~~~~~~~~~~~~~~ * - * Sphinx stylesheet -- sphinx13 theme. + * Sphinx stylesheet -- sphinxdoc theme. * * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. @@ -29,39 +29,6 @@ body { max-width: 1080px; } -.pageheader { - background-image: url(headerbg.png); - text-align: left; - padding: 10px 15px; -} - -.pageheader ul { - float: right; - color: white; - list-style-type: none; - padding-left: 0; - margin-top: 30px; - margin-right: 10px; -} - -.pageheader li { - float: left; - margin: 0 0 0 10px; -} - -.pageheader li a { - border-radius: 1px; - padding: 8px 12px; - color: #f9f9f0; - text-shadow: 0 0 5px rgba(0, 0, 0, 0.5); -} - -.pageheader li a:hover { - background-color: #f9f9f0; - color: #0a507a; - text-shadow: none; -} - div.document { background-color: white; text-align: left; @@ -110,7 +77,6 @@ div.related ul li a { div.related ul li a:hover { color: white; - /*text-decoration: underline;*/ text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5); } @@ -141,13 +107,11 @@ div.sphinxsidebar { } div.sphinxsidebar .logo { - font-size: 1.8em; - color: #0A507A; - font-weight: 300; text-align: center; } div.sphinxsidebar .logo img { + width: 150px; vertical-align: middle; } @@ -208,51 +172,55 @@ p { margin: 0.8em 0 0.5em 0; } -a { - color: #A2881D; - text-decoration: none; +a, a tt { + color: #2878a2; // a2881d } -a:hover { - color: #E1C13F; +a:hover, a tt:hover { + color: #68b8c2; // #e1c13f; } -div.body a { - text-decoration: underline; +a tt { + border: 0; +} + +h1, h2, h3, h4, h5, h6 { + color: #0a507a; + background-color: #f2f8fa; + font-weight: 300; } h1 { margin: 10px 0 0 0; - font-size: 2.4em; - color: #0A507A; - font-weight: 300; } h2 { margin: 1.em 0 0.2em 0; - font-size: 1.5em; - font-weight: 300; padding: 0; - color: #174967; } h3 { margin: 1em 0 -0.3em 0; - font-size: 1.3em; - font-weight: 300; } -div.body h1 a, div.body h2 a, div.body h3 a, div.body h4 a, div.body h5 a, div.body h6 a { +h1 { font-size: 200%; } +h2 { font-size: 160%; } +h3 { font-size: 140%; } +h4 { font-size: 120%; } +h5 { font-size: 110%; } +h6 { font-size: 100%; } + +div a, h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { text-decoration: none; } div.body h1 a tt, div.body h2 a tt, div.body h3 a tt, div.body h4 a tt, div.body h5 a tt, div.body h6 a tt { - color: #0A507A !important; + color: #0a507a !important; font-size: inherit !important; } a.headerlink { - color: #0A507A !important; + color: #0a507a !important; font-size: 12px; margin-left: 6px; padding: 0 4px 0 4px; @@ -289,15 +257,6 @@ hr { margin: 2em; } -a tt { - border: 0; - color: #a2881d; -} - -a tt:hover { - color: #e1c13f; -} - pre { font-family: 'Consolas', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace; @@ -312,7 +271,7 @@ pre { pre a { color: inherit; - text-decoration: underline; + text-decoration: none; } td.linenos pre { @@ -341,54 +300,39 @@ table td, table th { padding: 0.2em 0.5em 0.2em 0.5em; } -div.admonition, div.warning { - font-size: 0.9em; - margin: 1em 0 1em 0; - border: 1px solid #86989B; - border-radius: 2px; - background-color: #f7f7f7; - padding: 0; +div.note { + background-color: #eee; + border: 1px solid #ccc; } -div.admonition p, div.warning p { - margin: 0.5em 1em 0.5em 1em; - padding: 0; +div.seealso { + background-color: #ffc; + border: 1px solid #ff6; } -div.admonition pre, div.warning pre { - margin: 0.4em 1em 0.4em 1em; -} - -div.admonition p.admonition-title, -div.warning p.admonition-title { - margin-top: 1em; - padding-top: 0.5em; - font-weight: bold; +div.topic { + background-color: #eee; } div.warning { - border: 1px solid #940000; -/* background-color: #FFCCCF;*/ + background-color: #ffe4e4; + border: 1px solid #f66; } -div.warning p.admonition-title { +div.admonition ul li, div.warning ul li { + text-align: left; } -div.admonition ul, div.admonition ol, -div.warning ul, div.warning ol { - margin: 0.1em 0.5em 0.5em 3em; - padding: 0; +div.admonition p.admonition-title + p { + display: inline; } -.viewcode-back { - font-family: 'Open Sans', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', - 'Verdana', sans-serif; +p.admonition-title { + display: inline; } -div.viewcode-block:target { - background-color: #f4debf; - border-top: 1px solid #ac9; - border-bottom: 1px solid #ac9; +p.admonition-title:after { + content: ":"; } /* ------------------ our styles ----------------*/ @@ -428,17 +372,6 @@ div.feedback a { font-weight: bold; } -img.logo { - width: 150px; -} - -tt, tt.descname { - color: {{ theme_headtextcolor }}; - /*background-color: #ecf0f3;*/ - padding: 0 1px 0 1px; - font-size: 1.4em; -} - div.math p { margin-top: 10px; margin-bottom: 10px; @@ -457,7 +390,6 @@ dl.cfunction > dt:first-child tt.descname { color: #8080B0; } - dl.pyfunction > dt:first-child { margin-bottom: 7px; } From e7b3a73b620d6820110efd814e3b87d0e5522434 Mon Sep 17 00:00:00 2001 From: Dmitriy Anisimov Date: Fri, 5 Sep 2014 21:56:25 +0400 Subject: [PATCH 4/5] fixed all known issues --- doc/_themes/sphinxdoc/static/default.css_t | 60 +++++++++++++--------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/doc/_themes/sphinxdoc/static/default.css_t b/doc/_themes/sphinxdoc/static/default.css_t index 692f14162..16c4b7928 100644 --- a/doc/_themes/sphinxdoc/static/default.css_t +++ b/doc/_themes/sphinxdoc/static/default.css_t @@ -51,15 +51,13 @@ div.related { div.related ul { background-image: url(relbg.png); - height: 1.9em; + text-align: left; border-top: 1px solid #002e50; border-bottom: 1px solid #002e50; } -div.related ul li { - margin: 0 5px 0 0; - padding: 0; - float: left; +div.related li + li { + display: inline; } div.related ul li.right { @@ -122,6 +120,14 @@ div.sphinxsidebar input { font-size: 1em; } +div.sphinxsidebar #searchbox input[type="text"] { + width: 160px; +} + +div.sphinxsidebar #searchbox input[type="submit"] { + width: 40px; +} + div.sphinxsidebar h3 { font-size: 1.5em; border-top: 1px solid #0a507a; @@ -173,11 +179,11 @@ p { } a, a tt { - color: #2878a2; // a2881d + color: #2878a2; } a:hover, a tt:hover { - color: #68b8c2; // #e1c13f; + color: #68b8c2; } a tt { @@ -214,7 +220,8 @@ div a, h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { text-decoration: none; } -div.body h1 a tt, div.body h2 a tt, div.body h3 a tt, div.body h4 a tt, div.body h5 a tt, div.body h6 a tt { +div.body h1 a tt, div.body h2 a tt, div.body h3 a tt, +div.body h4 a tt, div.body h5 a tt, div.body h6 a tt { color: #0a507a !important; font-size: inherit !important; } @@ -234,10 +241,12 @@ a.headerlink:hover { } cite, code, tt { - font-family: 'Consolas', 'DejaVu Sans Mono', - 'Bitstream Vera Sans Mono', monospace; + font-family: 'Consolas', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', + monospace; font-size: 14px; letter-spacing: -0.02em; + min-width: 780px; + max-width: 1080px; } tt { @@ -258,8 +267,8 @@ hr { } pre { - font-family: 'Consolas', 'DejaVu Sans Mono', - 'Bitstream Vera Sans Mono', monospace; + font-family: 'Consolas', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', + monospace; font-size: 13px; letter-spacing: 0.015em; line-height: 120%; @@ -278,6 +287,12 @@ td.linenos pre { padding: 0.5em 0; } +td.code pre { + max-width: 740px; + overflow: auto; + overflow-y: hidden; /* fixes display issues on Chrome browsers */ +} + div.quotebar { background-color: #f8f8f8; max-width: 250px; @@ -319,7 +334,8 @@ div.warning { border: 1px solid #f66; } -div.admonition ul li, div.warning ul li { +div.admonition ul li, div.warning ul li, +div.admonition ol li, div.warning ol li { text-align: left; } @@ -348,17 +364,12 @@ div.toctree-wrapper li, ul.simple li { margin:0; } -a.toc-backref, a.toc-backref:hover { - font-family: {{ theme_headfont }}; - background-color: {{ theme_headbgcolor }}; - font-weight: normal; - color: {{ theme_headtextcolor }}; - text-decoration: none; -} +/*a.toc-backref { +}*/ div.feedback { - background-color: {{ theme_feedbackbgcolor }}; - color: {{ theme_feedbacktextcolor }}; + /*background-color: #;*/ + /*color: #;*/ padding: 20px 20px 30px 20px; border-top: 1px solid #002e50; } @@ -368,7 +379,7 @@ div.feedback h2 { } div.feedback a { - color: {{ theme_feedbacklinkcolor }}; + /*color: #;*/ font-weight: bold; } @@ -403,7 +414,8 @@ table.field-list { } em.menuselection, em.guilabel { - font-family: {{ theme_guifont }}; + font-family: 'Lucida Sans', 'Lucida Sans Unicode', 'Lucida Grande', Verdana, + Arial, Helvetica, sans-serif; } .enumeratevisibleitemswithsquare ul { From ad00e0dd4327613d405eda91af5d73932b0262a2 Mon Sep 17 00:00:00 2001 From: Dmitriy Anisimov Date: Sat, 6 Sep 2014 14:15:04 +0400 Subject: [PATCH 5/5] tt & header background colors changed --- doc/_themes/sphinxdoc/static/default.css_t | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/_themes/sphinxdoc/static/default.css_t b/doc/_themes/sphinxdoc/static/default.css_t index 16c4b7928..ce5ee0635 100644 --- a/doc/_themes/sphinxdoc/static/default.css_t +++ b/doc/_themes/sphinxdoc/static/default.css_t @@ -192,7 +192,7 @@ a tt { h1, h2, h3, h4, h5, h6 { color: #0a507a; - background-color: #f2f8fa; + background-color: #e5f5ff; font-weight: 300; } @@ -244,21 +244,17 @@ cite, code, tt { font-family: 'Consolas', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace; font-size: 14px; - letter-spacing: -0.02em; min-width: 780px; max-width: 1080px; } tt { - background-color: #f2f2f2; - border: 1px solid #ddd; - border-radius: 2px; - color: #333; + color: #003048; padding: 1px; } tt.descname, tt.descclassname, tt.xref { - border: 0; + font-size: 12px; } hr {