merge with trunk

CHANGES

@@ -114,6 +114,13 @@ Release 1.0 (in development)
 Release 0.6.5 (in development)
 ==============================
 
+* #345: Fix cropping of sidebar scroll bar with ``stickysidebar``
+  option of the default theme.
+
+* #341: Always generate UNIX newlines in the quickstart Makefile.
+
+* #338: Fix running with ``-C`` under Windows.
+
 * In autodoc, allow customizing the signature of an object where
   the built-in mechanism fails.
 

doc/theming.rst

@@ -162,6 +162,8 @@ These themes are:
     headings.
   - **headerlinkcolor** (CSS color): Color for the backreference link in
     headings.
+  - **textalign** (CSS *text-align* value): Text alignment for the body, default
+    is ``justify``.
 
 * **nature** -- A greenish theme.  There are currently no options beyond
   *nosidebar*.

sphinx/application.py

@@ -104,6 +104,11 @@ class Sphinx(object):
                              confoverrides or {}, self.tags)
         self.config.check_unicode(self.warn)
 
+        # set confdir to srcdir if -C given (!= no confdir); a few pieces
+        # of code expect a confdir to be set
+        if self.confdir is None:
+            self.confdir = self.srcdir
+
         # load all extension modules
         for extension in self.config.extensions:
             self.setup_extension(extension)

sphinx/environment.py

@@ -676,7 +676,7 @@ class BuildEnvironment:
         if app:
             app.emit('doctree-read', doctree)
 
-        # store time of reading, used to find outdated files
+        # store time of build, for outdated files detection
         self.all_docs[docname] = time.time()
 
         # make it picklable

sphinx/quickstart.py

@@ -837,7 +837,8 @@ directly.'''
     if d['makefile']:
         d['rsrcdir'] = d['sep'] and 'source' or '.'
         d['rbuilddir'] = d['sep'] and 'build' or d['dot'] + 'build'
-        f = open(path.join(d['path'], 'Makefile'), 'w')
+        # use binary mode, to avoid writing \r\n on Windows
+        f = open(path.join(d['path'], 'Makefile'), 'wb')
         f.write((MAKEFILE % d).encode('utf-8'))
         f.close()
 

sphinx/themes/agogo/static/agogo.css_t

@@ -39,10 +39,13 @@ div.header-wrapper {
 
 /* Default body styles */
 a {
-  text-decoration: none;
   color: {{ theme_linkcolor }};
 }
 
+div.bodywrapper a, div.footer a {
+  text-decoration: underline;
+}
+
 .clearer {
   clear: both;
 }
@@ -99,7 +102,21 @@ dt:hover > a.headerlink {
   visibility: visible;
 }
 
+img {
+  border: 0;
+}
 
+div.admonition {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding: 2px 7px 1px 7px;
+  border-left: 0.2em solid black;
+}
+
+p.admonition-title {
+  margin: 0px 10px 5px 0px;
+  font-weight: bold;
+}
 
 /* Header */
 
@@ -152,7 +169,7 @@ div.document {
 
 div.body {
   padding-right: 2em;
-  text-align: justify;
+  text-align: {{ theme_textalign }};
 }
 
 div.document ul {
@@ -217,6 +234,14 @@ div.sidebar {
   font-size: .9em;
 }
 
+div.sidebar a, div.header a {
+  text-decoration: none;
+}
+
+div.sidebar a:hover, div.header a:hover {
+  text-decoration: underline;
+}
+
 div.sidebar h3 {
   color: #2e3436;
   text-transform: uppercase;
@@ -241,6 +266,14 @@ div.sidebar li.toctree-l1 a {
 div.sidebar li.toctree-l2 a {
   background-color: transparent;
   border: none;
+  margin-left: 1em;
+  border-bottom: 1px solid #dddddd;
+}
+
+div.sidebar li.toctree-l3 a {
+  background-color: transparent;
+  border: none;
+  margin-left: 2em;
   border-bottom: 1px solid #dddddd;
 }
 

sphinx/themes/agogo/theme.conf

@@ -16,3 +16,4 @@ linkcolor = #ce5c00
 headercolor1 = #204a87
 headercolor2 = #3465a4
 headerlinkcolor = #fcaf3e
+textalign = justify

sphinx/themes/default/static/default.css_t

@@ -73,10 +73,11 @@ div.related a {
 div.sphinxsidebar {
     {%- if theme_stickysidebar|tobool %}
     top: 30px;
+    bottom: 0;
     margin: 0;
     position: fixed;
     overflow: auto;
-    height: 100%;
+    height: auto;
     {%- endif %}
     {%- if theme_rightsidebar|tobool %}
     float: right;