8000 [MRG] Updates on the scikit-learn sponsor page by cmarmo · Pull Request #15043 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]

Skip to content

[MRG] Updates on the scikit-learn sponsor page #15043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Oct 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dc4f084
Working on 'about' page.
cmarmo Sep 19, 2019
dfa181c
Merge branch 'master' into funders
cmarmo Sep 20, 2019
2c7df8e
Version available for comments.
cmarmo Sep 20, 2019
fb765c9
Merge branch 'master' into funders
cmarmo Sep 20, 2019
9db32e3
Merge branch 'master' into funders
cmarmo Sep 23, 2019
b94d6ac
Add a preface to the funder list.
cmarmo Sep 23, 2019
2ca0613
Removing logos from the homepage.
cmarmo Sep 23, 2019
b029d66
Consortium sponsors arranged in tables.
cmarmo Sep 23, 2019
ab71878
Merge master, fix table style.
cmarmo Sep 24, 2019
3ff3dbc
Merge branch 'master' into funders
cmarmo Sep 24, 2019
4c813cf
Merge branch 'master' into funders
cmarmo Sep 25, 2019
6973d6e
Tentative solution for logos display.
cmarmo Sep 25, 2019
1edd312
Improve visibility of sponsor link on the homepage.
cmarmo Sep 25, 2019
c5e543f
Merge branch 'funders' of https://github.com/cmarmo/scikit-learn into…
cmarmo Sep 26, 2019
097a27d
Merge branch 'master' into funders
cmarmo Sep 26, 2019
aa269a0
Implement some comments. More responsive design.
cmarmo Sep 26, 2019
8b84c2f
Sorry Jeremie.
cmarmo Sep 26, 2019
4731cdc
Pad Consortium members.
cmarmo Sep 26, 2019
544275d
Merge branch 'master' into funders
cmarmo Oct 2, 2019
6572759
Logos on the homepage.
cmarmo Oct 2, 2019
0e8baa9
Add link to funders.
cmarmo Oct 4, 2019
f2e4d84
No underlined link to funders.
cmarmo Oct 5, 2019
119b64d
Merge branch 'master' into funders
cmarmo Oct 8, 2019
bdb16a3
Remove logos from the homepage.
cmarmo Oct 8, 2019
b3759cb
New suggestion
cmarmo Oct 8, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
432 changes: 326 additions & 106 deletions doc/about.rst

Large diffs are not rendered by default.

Binary file added doc/images/anaconda-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/anaconda.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/axa-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/axa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/bcg-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/bcg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/bnp-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/bnp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/cds-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/dataiku-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/dataiku.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/inria-logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/intel-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/intel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/microsoft-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/microsoft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/nvidia-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/nvidia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/png-logo-inria-la-fondation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/sloan_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 16 additions & 20 deletions doc/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,6 @@ <h4 class="sk-landing-call-header">Community</h4>
</form>
<a class="btn btn-warning btn-big sk-donate-btn mb-1" onclick="document.getElementById('paypal-form').submit(); ">Help us, <strong>donate!</strong></a>
<a class="btn btn-warning btn-big mb-1" href="about.html#citing-scikit-learn"><strong>Cite us!</strong></a>
<p class="mt-2">
<a href="about.html#funding">Read more about donations</a>
</p>
</div>
<div class="col-md-4">
<h4 class="sk-landing-call-header">Who uses scikit-learn?</h4>
Expand Down Expand Up @@ -229,28 +226,27 @@ <h4 class="sk-landing-call-header">Who uses scikit-learn?</h4>
</div>
</div>
</div>

<div class="container-fluid py-3">
<div class="container sk-landing-container">
<div class="row">
<div class="col-md-3 mb-3">
<small>Funding provided by INRIA and others</small>
</div>
<div class="col-md-6 text-center">
<a href="about.html#funding" class="text-decoration-none">
<a class="sk-footer-funding-link" href="about.html#funding">
<div class="text-center">
<p class="mt-2">
scikit-learn development and maintenance are financially supported by
</p>
<img class="sk-footer-funding-logo" src="_static/inria-small.png" title="INRIA">
<img class="sk-footer-funding-logo" src="_static/google-small.png" title="Google">
<img class="sk-footer-funding-logo" src="_static/telecom-small.png" title="Télécom ParisTech">
<img class="sk-footer-funding-logo" src="_static/fnrs-logo-small.png" title="FNRS">
<img class="sk-footer-funding-logo" src="_static/sloan_logo-small.png" title="Alfred P. Sloan Foundation" >
<img class="sk-footer-funding-logo" src="_static/columbia-small.png" title="Columbia University">
<img class="sk-footer-funding-logo" src="_static/sloan_logo-small.png" title="Alfred P. Sloan Foundation" >
<img class="sk-footer-funding-logo" src="_static/sydney-stacked-small.png" title="The University of Sydney">
</a>
</div>
<div class="col-md-2 text-md-right">
<small><a href="about.html#funding">More info on our contributors</a></small>
</div>
</div>
<img class="sk-footer-funding-logo" src="_static/microsoft-small.png" title="Microsoft" >
<img class="sk-footer-funding-logo" src="_static/bcg-small.png" title="Boston Consulting Group" >
<img class="sk-footer-funding-logo" src="_static/axa-small.png" title="AXA Assurances" >
<img class="sk-footer-funding-logo" src="_static/bnp-small.png" title="BNP Paris Bas Cardif" >
<img class="sk-fo 10000 oter-funding-logo" src="_static/intel-small.png" title="Intel" >
<img class="sk-footer-funding-logo" src="_static/nvidia-small.png" title="Nvidia" >
<img class="sk-footer-funding-logo" src="_static/dataiku-small.png" title="Dataiku" >
<img class="sk-footer-funding-logo" src="_static/anaconda-small.png" title="Anaconda" >
</div>
</a>
</div>
</div>
{% endblock %}
41 changes: 38 additions & 3 deletions doc/themes/scikit-learn-modern/static/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -319,17 +319,20 @@ div#carouselExampleSlidesOnly {
min-height: 200px;
}

ul.sk-landing-call-list li {
margin-bottom: 0.25rem;
}

img.sk-footer-funding-logo {
max-height: 36px;
max-width: 80px;
margin: 0 8px;
margin-bottom: 8px;
}

ul.sk-landing-call-list li {
margin-bottom: 0.25rem;
a.sk-footer-funding-link:hover {
text-decoration: none;
}

/* DOCS STYLE */

.navbar > .sk-docs-container {
Expand Down Expand Up @@ -1055,6 +1058,38 @@ div.sk-page-content img.map {
transform: scale(0.5);
}

/* sponsor */

div.sk-sponsor-div {
display: flex;
flex-wrap: wrap;
-webkit-flex-align: center;
-ms-flex-align: center;
-webkit-align-items: center;
align-items: center;
}

div.sk-sponsor-div-box {
width: 100%;
}

@media screen and (min-width: 500px) {
div.sk-sponsor-div-box {
width: 50%;
}
}

table.sk-sponsor-table tr, table.sk-sponsor-table tr:nth-child(odd) {
border-style: none;
background-color: white;
vertical-align: middle;
text-align: center;
}

table.sk-sponsor-table td {
padding: 0.30rem;
}

/* pygments - highlightning */

.highlight .hll { background-color: #ffffcc }
Expand Down
Binary file modified doc/themes/scikit-learn/static/img/digicosme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0