Merge lp:~widelands-dev/widelands-website/sphinx_fixes into lp:widelands-website

Proposed by kaputtnik
Status: Merged
Merged at revision: 416
Proposed branch: lp:~widelands-dev/widelands-website/sphinx_fixes
Merge into: lp:widelands-website
Diff against target: 40 lines (+6/-2)
3 files modified
media/css/documentation.css (+4/-0)
sphinxdoc/views.py (+1/-1)
urls.py (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands-website/sphinx_fixes
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+301829@code.launchpad.net

Description of the change

Small fix to remove the server error regarding 'modindex'.

Also corrected vertical align of formulas in https://wl.widelands.org/docs/wl/geometry/

It also possible to change the color of the formulas, see

https://bugs.launchpad.net/widelands/+bug/1512093/comments/9

But this has to be done in the widelands source code.

See also bug 1512093

To post a comment you must log in.
Revision history for this message
kaputtnik (franku) wrote :

Ah, and fixed a 'Dajngo1.9 warning' regarding a redirect.

Revision history for this message
GunChleoc (gunchleoc) wrote :

The screenshots look good, so I'm in favour of getting this in.

Revision history for this message
kaputtnik (franku) wrote :

To be clear: The colored math symbols are part of the widelands branch: https://code.launchpad.net/~widelands-dev/widelands/sphinx_changes But this branch isn't ready to merge yet.

The branch proposed here isn't problematic so i will merge it without approving by someone else.

Revision history for this message
kaputtnik (franku) wrote :

Merged and deployed ...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'media/css/documentation.css'
2--- media/css/documentation.css 2012-05-16 22:31:25 +0000
3+++ media/css/documentation.css 2016-08-02 19:38:22 +0000
4@@ -7,6 +7,10 @@
5 visibility: visible;
6 }
7
8+img.math{
9+ vertical-align: middle;
10+}
11+
12 /*******************************/
13 /* Pygment Syntax Highlighting */
14 /*******************************/
15
16=== modified file 'sphinxdoc/views.py'
17--- sphinxdoc/views.py 2016-06-13 07:14:59 +0000
18+++ sphinxdoc/views.py 2016-08-02 19:38:22 +0000
19@@ -15,7 +15,7 @@
20
21 SPECIAL_TITLES = {
22 'genindex': 'General Index',
23- 'modindex': 'Module Index',
24+ 'py-modindex': 'Module Index',
25 'search': 'Search',
26 }
27
28
29=== modified file 'urls.py'
30--- urls.py 2016-07-25 19:57:43 +0000
31+++ urls.py 2016-08-02 19:38:22 +0000
32@@ -34,7 +34,7 @@
33 # url(r'^articles/comments/', include('django_comments.urls')),
34
35 # Redirect old urls to docs to docs/wl
36- url(r'^docs/$', RedirectView.as_view( url='/docs/wl' ), name='docs'),
37+ url(r'^docs/$', RedirectView.as_view( url='/docs/wl', permanent=True ), name='docs'),
38 url (r'^docs/', include('sphinxdoc.urls')),
39
40 # 3rd party, modified for widelands

Subscribers

People subscribed via source and target branches