[Python-checkins] r63557 - in doctools/trunk: CHANGES sphinx/htmlwriter.py sphinx/static/default.css sphinx/static/rightsidebar.css sphinx/static/sphinxdoc.css sphinx/static/stickysidebar.css sphinx/static/traditional.css sphinx/templates/layout.html
georg.brandl
python-checkins at python.org
Fri May 23 15:54:50 CEST 2008
Author: georg.brandl
Date: Fri May 23 15:54:50 2008
New Revision: 63557
Log:
Don't write SSI-like comments.
Rename sidebar to sphinxsidebar so that reST sidebars are not confused.
Modified:
doctools/trunk/CHANGES
doctools/trunk/sphinx/htmlwriter.py
doctools/trunk/sphinx/static/default.css
doctools/trunk/sphinx/static/rightsidebar.css
doctools/trunk/sphinx/static/sphinxdoc.css
doctools/trunk/sphinx/static/stickysidebar.css
doctools/trunk/sphinx/static/traditional.css
doctools/trunk/sphinx/templates/layout.html
Modified: doctools/trunk/CHANGES
==============================================================================
--- doctools/trunk/CHANGES (original)
+++ doctools/trunk/CHANGES Fri May 23 15:54:50 2008
@@ -22,6 +22,11 @@
* Handle project names containing spaces.
+* Don't write SSI-like comments in HTML output.
+
+* Rename the "sidebar" class to "sphinxsidebar" in order to stay different
+ from reST sidebars.
+
Release 0.3 (May 6, 2008)
=========================
Modified: doctools/trunk/sphinx/htmlwriter.py
==============================================================================
--- doctools/trunk/sphinx/htmlwriter.py (original)
+++ doctools/trunk/sphinx/htmlwriter.py Fri May 23 15:54:50 2008
@@ -67,7 +67,7 @@
self.body.append(self.starttag(node, 'dt'))
# anchor for per-desc interactive data
if node.parent['desctype'] != 'describe' and node['ids'] and node['first']:
- self.body.append('<!--#%s#-->' % node['ids'][0])
+ self.body.append('<!--[%s]-->' % node['ids'][0])
if node.parent['desctype'] in ('class', 'exception'):
self.body.append('%s ' % node.parent['desctype'])
def depart_desc_signature(self, node):
Modified: doctools/trunk/sphinx/static/default.css
==============================================================================
--- doctools/trunk/sphinx/static/default.css (original)
+++ doctools/trunk/sphinx/static/default.css Fri May 23 15:54:50 2008
@@ -31,11 +31,11 @@
padding: 0 20px 30px 20px;
}
-div.sidebarwrapper {
+div.sphinxsidebarwrapper {
padding: 10px 5px 0 10px;
}
-div.sidebar {
+div.sphinxsidebar {
float: left;
width: 230px;
margin-left: -100%;
@@ -92,7 +92,7 @@
}
/* ::: TOC :::: */
-div.sidebar h3 {
+div.sphinxsidebar h3 {
font-family: 'Trebuchet MS', sans-serif;
color: white;
font-size: 1.4em;
@@ -101,7 +101,7 @@
padding: 0;
}
-div.sidebar h4 {
+div.sphinxsidebar h4 {
font-family: 'Trebuchet MS', sans-serif;
color: white;
font-size: 1.3em;
@@ -110,41 +110,41 @@
padding: 0;
}
-div.sidebar p {
+div.sphinxsidebar p {
color: white;
}
-div.sidebar p.topless {
+div.sphinxsidebar p.topless {
margin: 5px 10px 10px 10px;
}
-div.sidebar ul {
+div.sphinxsidebar ul {
margin: 10px;
padding: 0;
list-style: none;
color: white;
}
-div.sidebar ul ul,
-div.sidebar ul.want-points {
+div.sphinxsidebar ul ul,
+div.sphinxsidebar ul.want-points {
margin-left: 20px;
list-style: square;
}
-div.sidebar ul ul {
+div.sphinxsidebar ul ul {
margin-top: 0;
margin-bottom: 0;
}
-div.sidebar a {
+div.sphinxsidebar a {
color: #98dbcc;
}
-div.sidebar form {
+div.sphinxsidebar form {
margin-top: 10px;
}
-div.sidebar input {
+div.sphinxsidebar input {
border: 1px solid #98dbcc;
font-family: sans-serif;
font-size: 1em;
@@ -425,7 +425,7 @@
/* :::: PREVIEW :::: */
-div.preview {
+div.preview {
background-image: url(style/preview.png);
padding: 0 20px 20px 20px;
margin-bottom: 30px;
@@ -795,14 +795,14 @@
/* :::: PRINT :::: */
@media print {
- div.document,
- div.documentwrapper,
+ div.document,
+ div.documentwrapper,
div.bodywrapper {
margin: 0;
width : 100%;
}
- div.sidebar,
+ div.sphinxsidebar,
div.related,
div.footer,
div#comments div.new-comment-box,
Modified: doctools/trunk/sphinx/static/rightsidebar.css
==============================================================================
--- doctools/trunk/sphinx/static/rightsidebar.css (original)
+++ doctools/trunk/sphinx/static/rightsidebar.css Fri May 23 15:54:50 2008
@@ -3,7 +3,7 @@
*/
-div.sidebar {
+div.sphinxsidebar {
float: right;
}
Modified: doctools/trunk/sphinx/static/sphinxdoc.css
==============================================================================
--- doctools/trunk/sphinx/static/sphinxdoc.css (original)
+++ doctools/trunk/sphinx/static/sphinxdoc.css Fri May 23 15:54:50 2008
@@ -207,7 +207,7 @@
text-decoration: underline;
}
-div.sidebar {
+div.sphinxsidebar {
margin: 0;
padding: 0.5em 15px 15px 0;
width: 210px;
@@ -216,7 +216,7 @@
/* margin-left: -100%; */
}
-div.sidebar h4, div.sidebar h3 {
+div.sphinxsidebar h4, div.sphinxsidebar h3 {
margin: 1em 0 0.5em 0;
font-size: 0.9em;
padding: 0.1em 0 0.1em 0.5em;
@@ -225,7 +225,7 @@
background-color: #AFC1C4;
}
-div.sidebar ul {
+div.sphinxsidebar ul {
padding-left: 1.5em;
margin-top: 7px;
list-style: none;
@@ -233,7 +233,7 @@
line-height: 130%;
}
-div.sidebar ul ul {
+div.sphinxsidebar ul ul {
list-style: square;
margin-left: 20px;
}
@@ -316,29 +316,29 @@
text-align: center;
}
-div.sidebar ul.toc {
+div.sphinxsidebar ul.toc {
margin: 1em 0 1em 0;
padding: 0 0 0 0.5em;
list-style: none;
}
-div.sidebar ul.toc li {
+div.sphinxsidebar ul.toc li {
margin: 0.5em 0 0.5em 0;
font-size: 0.9em;
line-height: 130%;
}
-div.sidebar ul.toc li p {
+div.sphinxsidebar ul.toc li p {
margin: 0;
padding: 0;
}
-div.sidebar ul.toc ul {
+div.sphinxsidebar ul.toc ul {
margin: 0.2em 0 0.2em 0;
padding: 0 0 0 1.8em;
}
-div.sidebar ul.toc ul li {
+div.sphinxsidebar ul.toc ul li {
padding: 0;
}
Modified: doctools/trunk/sphinx/static/stickysidebar.css
==============================================================================
--- doctools/trunk/sphinx/static/stickysidebar.css (original)
+++ doctools/trunk/sphinx/static/stickysidebar.css Fri May 23 15:54:50 2008
@@ -1,8 +1,8 @@
/**
- * Sphinx Doc Design -- Sticky Sidebar Overrides
+ * Sphinx Doc Design -- Sticky sidebar Overrides
*/
-div.sidebar {
+div.sphinxsidebar {
top: 30px;
left: 0px;
position: fixed;
@@ -16,4 +16,4 @@
div.documentwrapper {
margin-top: 30px;
-}
\ No newline at end of file
+}
Modified: doctools/trunk/sphinx/static/traditional.css
==============================================================================
--- doctools/trunk/sphinx/static/traditional.css (original)
+++ doctools/trunk/sphinx/static/traditional.css Fri May 23 15:54:50 2008
@@ -24,13 +24,13 @@
padding: 0 20px 30px 20px;
}
-div.sidebarwrapper {
+div.sphinxsidebarwrapper {
border: 1px solid #99ccff;
padding: 10px;
margin: 10px 15px 10px 0;
}
-div.sidebar {
+div.sphinxsidebar {
float: right;
margin-left: -100%;
width: 230px;
@@ -78,30 +78,30 @@
}
/* ::: SIDEBAR :::: */
-div.sidebar h3 {
+div.sphinxsidebar h3 {
margin: 0;
}
-div.sidebar h4 {
+div.sphinxsidebar h4 {
margin: 5px 0 0 0;
}
-div.sidebar p.topless {
+div.sphinxsidebar p.topless {
margin: 5px 10px 10px 10px;
}
-div.sidebar ul {
+div.sphinxsidebar ul {
margin: 10px;
margin-left: 15px;
padding: 0;
}
-div.sidebar ul ul {
+div.sphinxsidebar ul ul {
margin-top: 0;
margin-bottom: 0;
}
-div.sidebar form {
+div.sphinxsidebar form {
margin-top: 10px;
}
@@ -350,7 +350,7 @@
/* :::: PREVIEW :::: */
-div.preview {
+div.preview {
background-image: url(style/preview.png);
padding: 0 20px 20px 20px;
margin-bottom: 30px;
@@ -690,7 +690,7 @@
margin: 0;
}
- div.sidebar,
+ div.sphinxsidebar,
div.related,
div.footer,
div#comments div.new-comment-box,
Modified: doctools/trunk/sphinx/templates/layout.html
==============================================================================
--- doctools/trunk/sphinx/templates/layout.html (original)
+++ doctools/trunk/sphinx/templates/layout.html Fri May 23 15:54:50 2008
@@ -34,8 +34,8 @@
{%- endmacro %}
{%- macro sidebar %}
{%- if builder != 'htmlhelp' %}
- <div class="sidebar">
- <div class="sidebarwrapper">
+ <div class="sphinxsidebar">
+ <div class="sphinxsidebarwrapper">
{%- block sidebarlogo %}
{%- if logo %}
<p class="logo"><img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/></p>
More information about the Python-checkins
mailing list