From: Mike Bayer Date: Sat, 16 Apr 2011 00:41:13 +0000 (-0400) Subject: some font changes to match the site style X-Git-Tag: rel_0_7b4~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33e906638a3a99556ff9f3d4e0f63cf14c06e966;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git some font changes to match the site style --- diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index 9518b9013f..a2a7f274db 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -1,40 +1,78 @@ -/* documentation section styles */ +body { + background-color: #FDFBFC; + margin:38px; + color:#333333; +} body, td { - font-family: verdana, sans-serif; - font-size:.9em; + font-family: verdana, sans-serif; + font-size:.9em; } -body { - background-color: #FDFBFC; - margin:38px; - color:#333333; +h1, h2, h3, h4, h5 { + font-family:Tahoma,Geneva,sans-serif; + font-weight:normal; + font-family:arial,Helvetica, sans-serif; + font-weight:bold; } +h1 { + font-size:20px; + line-height:22px; + color: #222222; + font-family:arial,Helvetica, sans-serif; + font-weight:normal; + margin: 0; + padding: 0; +} +h1, #topnav h2 { + font-family:Tahoma,Geneva,sans-serif; + font-weight:normal; +} form { display:inline; } p { - margin-top:10px; - margin-bottom:10px; + margin-top:10px; + margin-bottom:10px; } - a { - font-weight:normal; - text-decoration:none; + font-weight:normal; + text-decoration:none; } -a:link {color:#0000FF;} -a:visited {color:#0000FF;} -a:active {color:#0000FF;} -a:hover {color:#700000;} +a:link, a:visited, a:active { + color:#0000FF; +} +a:hover { + color:#700000; +} strong a { font-weight: bold; } +.document { + border: solid 1px #ccc; +} + +.document h1, .document h2, .document h3, .document h4, .document h5 { + font-size: 1.4em; +} + +.document img { + display:block; + margin: 0 auto; +} + +.document h1 { + display:none; +} + + +/* standard page elements */ #search { float:right; } @@ -43,7 +81,6 @@ strong a { padding:20px; } - #navbanner { } @@ -59,67 +96,38 @@ strong a { #pagecontrol li { font-size:.9em; list-style-type:none; + margin:0px; + padding:1px 8px; } -.topnav { - background-color: #fbfbee; - border: solid 1px #ccc; - padding:10px; - margin:10px 0px 10px 0px; - display:block; -} - -.document { - border: solid 1px #ccc; +#topnav { + background-color: #fbfbee; + border: solid 1px #ccc; + padding:10px; + margin:10px 0px 10px 0px; + display:block; } -.topnav .prevnext { +#topnav .prevnext { padding: 5px 0px 0px 0px; /*font-size: 0.8em*/ } -h1, h2, h3, h4, h5 { - font-family:arial,helvetica,sans-serif; - font-weight:bold; -} - -.document h1, .document h2, .document h3, .document h4, .document h5 { - font-size: 1.4em; -} - -.document img { - display:block; - margin: 0 auto; -} - -.document h1 { - display:none; -} - -h1 { - font: normal 20px/22px arial,helvetica,sans-serif; - color: #222; - padding:0px; - margin:0px; -} - -.topnav h2 { +#topnav h2 { margin:8px 4px 0px 5px; - font-family:arial,helvetica,sans-serif; font-size:1.6em; font-weight:normal; line-height:1.6em; } -.topnav h3 { +#topnav h3 { font-weight: bold; font-size: 1.4em; margin:0px; display:inline; - font-family:verdana,sans-serif; } -.topnav li, +#navbanner li, li.toctree-l1, li.toctree-l1 li { @@ -129,24 +137,51 @@ li.toctree-l1 li } -.topnav li ul, +#topnav li ul, li.toctree-l1 ul { padding:0px 0px 0px 20px; } -.topnav li ul li li, -li.toctree-l1 ul li li -{ - /*font-size:.90em;*/ +#topnav li ul li li, +li.toctree-l1 ul li li { } -.sourcelink { - font-size:.8em; - text-align:right; - padding-top:10px; +.versionheader { + margin-top: 0.5em; +} +.versionnum { + font-weight: bold; +} +.prerelease { + border: solid #c25757 2px; + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + background-color: #c21a1a; + color: white; + padding: 0.05em 0.2em; } +.bottomnav { + background-color:#FBFBEE; + border:1px solid #CCCCCC; + float:right; + margin: 1em 0 1em 5px; + padding:10px; +} + +.totoc { + +} + +.doc_copyright { + font-size:.85em; + padding:10px 0px 10px 0px; +} + +/* ReST specific section padding */ + .section ul { padding: 0 0 0 25px; } @@ -170,6 +205,8 @@ li.toctree-l1 ul li li margin:0px 0px 0px 20px; } +/* special index sections */ + div#sqlalchemy-documentation { font-size:.95em; } @@ -208,56 +245,15 @@ div#dialect-documentation { clear:left; } - -th.field-name { - text-align:right; -} - - -div.note, div.warning, p.deprecated { - background-color:#EEFFEF; -} - - -div.admonition, div.topic, p.deprecated { - border:1px solid #CCCCCC; - margin:5px 5px 5px 5px; - padding:5px 5px 5px 35px; - font-size:.9em; -} - -div.warning .admonition-title { - color:#FF0000; -} - -div.admonition .admonition-title { - font-weight:bold; -} - -.bottomnav { - background-color:#FBFBEE; - border:1px solid #CCCCCC; - float:right; - margin: 1em 0 1em 5px; - padding:10px; -} - -.totoc { - -} - -.doc_copyright { - font-size:.85em; - padding:10px 0px 10px 0px; -} +/* SQL popup, code styles */ pre { - background-color: #f0f0f0; - border: solid 1px #ccc; - padding:10px; - margin: 5px 5px 5px 5px; - overflow:auto; - line-height:1.3em; + background-color: #f0f0f0; + border: solid 1px #ccc; + padding:10px; + margin: 5px 5px 5px 5px; + overflow:auto; + line-height:1.3em; } .popup_sql, .show_sql @@ -269,16 +265,16 @@ pre { .sql_link { - font-weight:normal; - font-family: arial, sans-serif; + font-weight:normal; + font-family: arial, sans-serif; text-transform: uppercase; - font-size: 0.9em; - color:#666; - border:1px solid; - padding:1px 2px 1px 2px; - margin:0px 10px 0px 15px; - float:right; - line-height:1.2em; + font-size: 0.9em; + color:#666; + border:1px solid; + padding:1px 2px 1px 2px; + margin:0px 10px 0px 15px; + float:right; + line-height:1.2em; } #docs a.sql_link, .sql_link @@ -294,25 +290,34 @@ pre { background-color: #900; } -.versionheader { - margin-top: 0.5em; +/* other assorted ReST styles */ + +th.field-name { + text-align:right; } -.versionnum { - font-weight: bold; + +div.note, div.warning, p.deprecated { + background-color:#EEFFEF; +} + +div.admonition, div.topic, p.deprecated { + border:1px solid #CCCCCC; + margin:5px 5px 5px 5px; + padding:5px 5px 5px 35px; + font-size:.9em; +} + +div.warning .admonition-title { + color:#FF0000; +} + +div.admonition .admonition-title { + font-weight:bold; } .viewcode-back, .viewcode-link { float:right; } -.prerelease { - border: solid #c25757 2px; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - background-color: #c21a1a; - color: white; - padding: 0.05em 0.2em; -} dl.function > dt, dl.attribute > dt, @@ -375,10 +380,10 @@ tt { @media print { #nav { display: none; } #pagecontrol { display: none; } - .topnav .prevnext { display: none; } + #topnav .prevnext { display: none; } .bottomnav { display: none; } .totoc { display: none; } - .topnav ul li a { text-decoration: none; color: #000; } + #topnav ul li a { text-decoration: none; color: #000; } } /* syntax highlighting overrides */ diff --git a/doc/build/templates/layout.mako b/doc/build/templates/layout.mako index 1bfa5c9851..025e22f801 100644 --- a/doc/build/templates/layout.mako +++ b/doc/build/templates/layout.mako @@ -1,7 +1,7 @@ ## coding: utf-8 <%inherit file="${context['mako_layout']}"/> -<%def name="headers()"> +<%block name="headers"> @@ -35,105 +35,101 @@ % if prevtopic: % endif - ${self.extrahead()} - -<%def name="extrahead()"> + -

${docstitle|h}

+

${docstitle|h}

- + -
- Version: ${release} Last Updated: ${last_updated} -
-
+
+ Version: ${release} Last Updated: ${last_updated} +
+
-
-
- +
+ -
-
+ + + % if display_toc and \ + not current_page_name.startswith('index') and \ + not current_page_name.startswith('contents'): + ${toc} + % endif + +
+ -
-
- ${next.body()} -
-
+
+
+ ${next.body()} +
+
- <%def name="footer()"> -
- % if prevtopic: - Previous: - ${prevtopic['title']} - % endif - % if nexttopic: - Next: - ${nexttopic['title']} - % endif -
- % if hasdoc('copyright'): - © Copyright ${copyright|h}. - % else: - © Copyright ${copyright|h}. - % endif - % if show_sphinx: - Created using Sphinx ${sphinx_version|h}. - % endif -
-
- - ${self.footer()} +<%block name="footer"> +
+ % if prevtopic: + Previous: + ${prevtopic['title']} + % endif + % if nexttopic: + Next: + ${nexttopic['title']} + % endif +
+ % if hasdoc('copyright'): + © Copyright ${copyright|h}. + % else: + © Copyright ${copyright|h}. + % endif + % if show_sphinx: + Created using Sphinx ${sphinx_version|h}. + % endif +
+
+ -<%def name="show_title()"> -% if title: - ${title} -% endif - diff --git a/doc/build/templates/search.mako b/doc/build/templates/search.mako index dfad4d0e56..d4ef4d333f 100644 --- a/doc/build/templates/search.mako +++ b/doc/build/templates/search.mako @@ -3,7 +3,9 @@ <%! local_script_files = ['_static/searchtools.js'] %> -<%def name="show_title()">${_('Search')} +<%block name="show_title"> + ${_('Search')} +

Enter Search Terms:

@@ -16,7 +18,7 @@
-<%def name="footer()"> +<%block name="footer"> ${parent.footer()} - + diff --git a/doc/build/templates/site_base.mako b/doc/build/templates/site_base.mako index 76777b7fdc..90aa9be615 100644 --- a/doc/build/templates/site_base.mako +++ b/doc/build/templates/site_base.mako @@ -19,7 +19,8 @@ ${next.body()} ${''} <%text><%def name="style()"> - ${self.headers()} + <%block name="headers"/> + <%text>${parent.style()} <%text> diff --git a/doc/build/templates/static_base.mako b/doc/build/templates/static_base.mako index eaca5ced64..c3be6d4036 100644 --- a/doc/build/templates/static_base.mako +++ b/doc/build/templates/static_base.mako @@ -6,7 +6,7 @@ ${metatags and metatags or ''} ${capture(self.show_title)|util.striptags} — ${docstitle|h} - ${self.headers()} + <%block name="headers"/> ${next.body()}