[vispy] 04/10: fix the scikit theme problem
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sat Aug 30 17:17:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository vispy.
commit 6ef2490fc3fd4000cdf6c9e276c6eb8d7f502670
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Thu Feb 20 14:56:57 2014 +0100
fix the scikit theme problem
---
.../0002-use-the-latest-scikit-image-theme.patch | 159 +++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 160 insertions(+)
diff --git a/debian/patches/0002-use-the-latest-scikit-image-theme.patch b/debian/patches/0002-use-the-latest-scikit-image-theme.patch
new file mode 100644
index 0000000..7faac1a
--- /dev/null
+++ b/debian/patches/0002-use-the-latest-scikit-image-theme.patch
@@ -0,0 +1,159 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Thu, 20 Feb 2014 14:56:21 +0100
+Subject: use the latest scikit-image theme
+
+---
+ doc/themes/scikit-image/layout.html | 12 ++++++------
+ doc/themes/scikit-image/search.html | 2 +-
+ doc/themes/scikit-image/static/css/custom.css | 21 ++++++++++++++-------
+ doc/themes/scikit-image/static/js/docversions.js | 21 ---------------------
+ 4 files changed, 21 insertions(+), 35 deletions(-)
+ delete mode 100644 doc/themes/scikit-image/static/js/docversions.js
+
+diff --git a/doc/themes/scikit-image/layout.html b/doc/themes/scikit-image/layout.html
+index 1c6163a..58424f2 100644
+--- a/doc/themes/scikit-image/layout.html
++++ b/doc/themes/scikit-image/layout.html
+@@ -2,7 +2,8 @@
+ scikit-image/layout.html
+ ~~~~~~~~~~~~~~~~~
+
+- Sphinx layout template for the scikit-image theme
++ Sphinx layout template for the scikit-image theme, written by
++ Johannes Schönberger.
+
+ #}
+
+@@ -74,18 +75,18 @@
+ <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
+ {%- endif %}
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+- <link rel="shortcut icon" href="http://vispy.org/_static/favicon.ico">
++ <link rel="shortcut icon" href="{{ pathto('_static/', 1) }}favicon.ico">
+ {%- block extrahead %}{% endblock %}
+ </head>
+ <body class="container">
+- <a href="http://vispy.org" class="logo"><img src="http://vispy.org/_static/img/logo.png" alt=""></a>
++ <a href="http://scikit-image.org" class="logo"><img src="{{ pathto('_static/', 1) }}img/logo.png" alt=""></a>
+ <div class="clearfix"></div>
+ <div class="navbar">
+ <div class="navbar-inner">
+ <ul class="nav">
+ {% include 'navbar.html' %}
+ </ul>
+- <form class="navbar-form pull-right" action="search.html" method="get">
++ <form class="navbar-form pull-right" action="{{ pathto('search') }}" method="get">
+ <input type="text" class="search span3" name="q" placeholder="Search documentation ...">
+ <input type="hidden" name="check_keywords" value="yes" >
+ <input type="hidden" name="area" value="default" >
+@@ -104,9 +105,8 @@
+ </div>
+ <div class="well footer">
+ <small>
+- © Copyright the vispy development team.
++ © Copyright the scikit-image development team.
+ Created using <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> and <a href="http://sphinx.pocoo.org/">Sphinx</a>.
+- Theme by <a href="http://scikit-image.org/">scikit-image</a>.
+ </small>
+ </div>
+ </body>
+diff --git a/doc/themes/scikit-image/search.html b/doc/themes/scikit-image/search.html
+index 3a723ef..61520e6 100644
+--- a/doc/themes/scikit-image/search.html
++++ b/doc/themes/scikit-image/search.html
+@@ -43,4 +43,4 @@
+ </ul>
+ {% endif %}
+ </div>
+-{% endblock %}
+\ No newline at end of file
++{% endblock %}
+diff --git a/doc/themes/scikit-image/static/css/custom.css b/doc/themes/scikit-image/static/css/custom.css
+index 2d64dbb..0a2d313 100644
+--- a/doc/themes/scikit-image/static/css/custom.css
++++ b/doc/themes/scikit-image/static/css/custom.css
+@@ -41,6 +41,12 @@ h6 {
+ font-size: 13px;
+ line-height: 15px;
+ }
++blockquote {
++ border-left: 0;
++}
++dt {
++ font-weight: normal;
++}
+
+ .logo {
+ float: left;
+@@ -51,21 +57,18 @@ h6 {
+ }
+
+ .hero {
+- padding: 10px 25px 15px 25px;
++ padding: 10px 25px;
+ }
+
+ .gallery-random {
+ float: right;
+ line-height: 180px;
+- margin-left: 10px;
+ }
+ .gallery-random img {
+ max-height: 180px;
+- max-width: 180px;
+ }
+
+ .coins-sample {
+- float: left;
+ padding: 5px;
+ }
+
+@@ -76,6 +79,10 @@ h6 {
+ padding-left: 15px;
+ }
+
++#current {
++ font-weight: bold;
++}
++
+ .headerlink {
+ margin-left: 10px;
+ color: #ddd;
+@@ -226,7 +233,7 @@ p.admonition-title {
+ text-align: center !important;
+ }
+
+-.summary-box {
+- /* Should derive width from span8 */
+- width: 640px;
++/* misc */
++div.math {
++ text-align: center;
+ }
+diff --git a/doc/themes/scikit-image/static/js/docversions.js b/doc/themes/scikit-image/static/js/docversions.js
+deleted file mode 100644
+index 951ce3e..0000000
+--- a/doc/themes/scikit-image/static/js/docversions.js
++++ /dev/null
+@@ -1,21 +0,0 @@
+-var versions = ['latest', 'v0.1.0'];
+-
+-function insert_version_links() {
+- for (i = 0; i < versions.length; i++){
+- open_list = '<li>'
+- if (typeof(DOCUMENTATION_OPTIONS) !== 'undefined') {
+- if ((DOCUMENTATION_OPTIONS['VERSION'] == versions[i]) ||
+- (DOCUMENTATION_OPTIONS['VERSION'].match(/dev$/) && (i == 0))) {
+- open_list = '<li id="current">'
+- }
+- }
+- document.write(open_list);
+- document.write('<a href="URL">vispy VERSION</a> </li>\n'
+- .replace('VERSION', versions[i])
+- .replace('URL', 'http://api.vispy.org/en/' + versions[i]));
+- }
+-}
+-
+-function stable_version() {
+- return versions[1];
+-}
diff --git a/debian/patches/series b/debian/patches/series
index a015379..fbbf73c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-fix-the-documentation-compilation.patch
+0002-use-the-latest-scikit-image-theme.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vispy.git
More information about the debian-science-commits
mailing list