8000 Merge pull request #2350 from jaquesgrobler/DOC_inria_google_logos · paulgb/scikit-learn@8765d95 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8765d95

Browse files
jaquesgroblerjaquesgrobler
committed
Merge pull request scikit-learn#2350 from jaquesgrobler/DOC_inria_google_logos
DOC: contributors logos added to index screen footer
2 parents faddb45 + 41dc21a commit 8765d95

File tree

4 files changed

+42
-5
lines changed

4 files changed

+42
-5
lines changed

‎doc/images/FNRS-logo.png

11.4 KB
Loading

‎doc/index.rst

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@
269269
<div class="span4">
270270
<h4>Community</h4>
271271
<ul>
272+
<li><em>About us</em> See <a href="about.html">authors</a> # scikit-learn</li>
272273
<li><em>Questions?</em> See <a href="http://stackoverflow.com/questions/tagged/scikit-learn">stackoverflow</a> # scikit-learn</li>
273274
<li><em>Mailing list:</em> <a href="https://lists.sourceforge.net/lists/listinfo/scikit-learn-general">scikit-learn-general@lists.sourceforge.net</a></li>
274275
<li><em>IRC:</em> #scikit-learn @ <a href="http://webchat.freenode.net/">freenode</a></li>
@@ -333,6 +334,31 @@
333334

334335
</div>
335336
</div>
337+
338+
<!--Bottom of index page contributions logos-->
339+
<div class="container index-upper" >
340+
<div class="row-fluid">
341+
<div class="footer">
342+
<div class="span4">
343+
Generous funding provided by INRIA, Google and others.
344+
</div>
345+
<div class="span4">
346+
<a class="reference internal" href="about.html#funding" style="text-decoration: none" >
347+
<img id="index-funding-logo-big" src="_images/inria-small.jpg" title="INRIA">
348+
<img id="index-funding-logo-small" src="_images/google-logo.png" title="Google">
349+
<!--Due to Télécom ParisTech's logo text being smaller, a style has been added to improve readability-->
350+
<img id="index-funding-logo-small" src="_images/telecomparistech.jpg" title="Télécom ParisTech" style="max-height: 36px">
351+
<img id="index-funding-logo-small" src="_images/FNRS-logo.png" title="FNRS">
352+
</a>
353+
</div>
354+
<div class="span4">
355+
<a class="reference internal" href="about.html#funding">
356+
More information on our contributors
357+
</a>
358+
</div>
359+
</div>
360+
</div>
361+
</div>
336362
</div>
337363

338364

‎doc/themes/scikit-learn/layout.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,18 +302,20 @@ <h2>Machine Learning in Python</h2>
302302

303303
{%- block footer %}
304304
<div class="footer">
305-
{%- if show_copyright %}
305+
{%- if pagename != 'index' %}
306+
{%- if show_copyright %}
306307
{%- if hasdoc('copyright') %}
307308
{% trans path=pathto('copyright'), copyright=copyright|e %}&copy; {{ copyright }}.{% endtrans %}
308309
{%- else %}
309310
{% trans copyright=copyright|e %}&copy; {{ copyright }}.{% endtrans %}
310311
{%- endif %}
311-
{%- endif %}
312-
{%- if last_updated %}
312+
{%- endif %}
313+
{%- if last_updated %}
313314
{% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
314-
{%- endif %}
315-
{%- if show_source and has_source and sourcename %}
315+
{%- endif %}
316+
{%- if show_source and has_source and sourcename %}
316317
<a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow">{{ _('Show this page source') }}</a>
318+
{%- endif %}
317319
{%- endif %}
318320
</div>
319321

‎doc/themes/scikit-learn/static/nature.css_t

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,15 @@ div.testimonial span.testimonial-author p{
10341034
color: #808080;
10351035
}
10361036

1037+
#index-funding-logo-big {
1038+
padding: 0 7px 7px 7px;
1039+
max-height: 40px
1040+
}
1041+
1042+
#index-funding-logo-small {
1043+
padding: 0 7px 7px 7px;
1044+
max-height: 24px
1045+
}
10371046

10381047
.no-display {
10391048
display: none;

0 commit comments

Comments
 (0)
0