[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/c8326b88d058
changeset:   92716:c8326b88d058
parent:      92713:a4da150fbfd4
parent:      92715:b1596a7b52a0
user:        Georg Brandl <georg at python.org>
date:        Wed Oct 01 19:28:33 2014 +0200
summary:
  merge with 3.4

files:
  Doc/tools/pydoctheme/static/pydoctheme.css |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/tools/pydoctheme/static/pydoctheme.css b/Doc/tools/pydoctheme/static/pydoctheme.css
--- a/Doc/tools/pydoctheme/static/pydoctheme.css
+++ b/Doc/tools/pydoctheme/static/pydoctheme.css
@@ -105,20 +105,20 @@
     color: #00B0E4;
 }
 
-tt, pre {
+tt, code, pre {
     font-family: monospace, sans-serif;
     font-size: 96.5%;
 }
 
-div.body tt {
+div.body tt, div.body code {
     border-radius: 3px;
 }
 
-div.body tt.descname {
+div.body tt.descname, div.body code.descname {
     font-size: 120%;
 }
 
-div.body tt.xref, div.body a tt {
+div.body tt.xref, div.body a tt, div.body code.xref, div.body a code {
     font-weight: normal;
 }
 

-- 
Repository URL: https://hg.python.org/cpython