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
=== modified file 'media/css/documentation.css'
--- media/css/documentation.css 2012-05-16 22:31:25 +0000
+++ media/css/documentation.css 2016-08-02 19:38:22 +0000
@@ -7,6 +7,10 @@
7 visibility: visible; 7 visibility: visible;
8}8}
99
10img.math{
11 vertical-align: middle;
12}
13
10/*******************************/14/*******************************/
11/* Pygment Syntax Highlighting */15/* Pygment Syntax Highlighting */
12/*******************************/16/*******************************/
1317
=== modified file 'sphinxdoc/views.py'
--- sphinxdoc/views.py 2016-06-13 07:14:59 +0000
+++ sphinxdoc/views.py 2016-08-02 19:38:22 +0000
@@ -15,7 +15,7 @@
1515
16SPECIAL_TITLES = {16SPECIAL_TITLES = {
17 'genindex': 'General Index',17 'genindex': 'General Index',
18 'modindex': 'Module Index',18 'py-modindex': 'Module Index',
19 'search': 'Search',19 'search': 'Search',
20}20}
2121
2222
=== modified file 'urls.py'
--- urls.py 2016-07-25 19:57:43 +0000
+++ urls.py 2016-08-02 19:38:22 +0000
@@ -34,7 +34,7 @@
34# url(r'^articles/comments/', include('django_comments.urls')),34# url(r'^articles/comments/', include('django_comments.urls')),
3535
36 # Redirect old urls to docs to docs/wl36 # Redirect old urls to docs to docs/wl
37 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')),38 url (r'^docs/', include('sphinxdoc.urls')),
39 39
40 # 3rd party, modified for widelands40 # 3rd party, modified for widelands

Subscribers

People subscribed via source and target branches