diff --git a/doc/logos/scikit-learn-logo-small.png b/doc/logos/scikit-learn-logo-small.png index 7cc5fbde5dd7646d51001f5ec92db0182f60c3e3..fd763b2b6bbb723dfbecd16a9ca116efee2eba56 100644 Binary files a/doc/logos/scikit-learn-logo-small.png and b/doc/logos/scikit-learn-logo-small.png differ diff --git a/doc/themes/scikit-learn/layout.html b/doc/themes/scikit-learn/layout.html index afa91a675911b60c15c65ac2610e76f991de8537..b8621f72a49c5c2a60b75fd23b82b92f8f8e779c 100644 --- a/doc/themes/scikit-learn/layout.html +++ b/doc/themes/scikit-learn/layout.html @@ -30,15 +30,23 @@ <li><a href="{{pathto('developers/index')}}">development</a></li> </ul> - <form class="search" action="{{ pathto('search') }}" method="get"> - <input id="search_input" - type="text" name="q" size="18" value=" search..." - onfocus="if(this.value==this.defaultValue)this.value='';this.style.color='black'" - onblur="if(this.value=='') { this.value=this.defaultValue;this.style.color='#cccccc'}"/> - <input type="submit" value="{{ _('Go') }}" /> - <input type="hidden" name="check_keywords" value="yes" /> - <input type="hidden" name="area" value="default" /> - </form> +<div class="search_form"> + +<div id="cse" style="width: 100%;">.</div> +<script src="http://www.google.com/jsapi" type="text/javascript"></script> +<script type="text/javascript"> + google.load('search', '1', {language : 'en'}); + google.setOnLoadCallback(function() { + var customSearchControl = new google.search.CustomSearchControl('016639176250731907682:tjtqbvtvij0'); + customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET); + var options = new google.search.DrawOptions(); + options.setAutoComplete(true); + customSearchControl.draw('cse', options); + }, true); +</script> + +</div> + </div> <!-- end navbar --> {%- endblock -%} @@ -75,9 +83,21 @@ <p>Watch the 2010 ICML <a href="http://videolectures.net/icml2010_varaquaux_scik/">Introductory Video</a> by Gaƫl Varoquaux.</p> + + <h3>Participate</h3> + + <p>Fork + the <a href="http://github.com/scikit-learn/scikit-learn">source + code</a>, join the + <a href="{{pathto('support')}}#mailing-list">mailing + lists</a>, <a href="http://sourceforge.net/apps/trac/scikit-learn/report/1">issue + tracker</a> or participate in the next + <a href="http://github.com/scikit-learn/scikit-learn/wiki/Upcoming-events">coding sprint</a>. + </p> + {% endif %} - <h3>{{ _('Contents') }}</h3> + <h3>{{ _('Contents') }}</h3> {{ toc }} </div> diff --git a/doc/themes/scikit-learn/static/nature.css_t b/doc/themes/scikit-learn/static/nature.css_t index 162ed8e8e735b954c59022d31a551827f497c769..230dd0a8d903076b76f8ece3badaabac9f65314c 100644 --- a/doc/themes/scikit-learn/static/nature.css_t +++ b/doc/themes/scikit-learn/static/nature.css_t @@ -8,6 +8,7 @@ * :license: BSD, see LICENSE for details. * */ +/* @import url("minimalist.css") /\* google custom search *\/ */ @import url("basic.css"); /* -- page layout ----------------------------------------------------------- */ @@ -28,7 +29,13 @@ div.header-wrapper { border-radius: 15px; -moz-border-radius: 15px; margin-top: 10px; -} +} + +div.header { + /* for the logo to correctly expand when showing results + but remain cut when not */ + overflow: hidden; +} p.logo { @@ -36,19 +43,20 @@ p.logo { margin-left: 20px; float: left; margin: 0 0 0 20px; + height: 50px; } span.legend { font-family: Verdana; - font-size: 13px; + font-size: 15px; position: relative; left: -35px; top: -3px; } div.navbar { - padding-top: 13px; - margin-left: 230px; + padding-top: 15px; + margin-left: 220px; } div.navbar ul { @@ -84,12 +92,23 @@ div.navbar ul li a:hover { /* display: inline; */ /* } */ -form.search { - margin-left: 15px; - display: inline; +/* div.search { */ +/* margin-left: 15px; */ +/* display: inline; */ +/* } */ + +.gsc-input { + width: 180px; + float: right; } -#search_input { - color: #CCC; + +.search_form { + margin-top: -23px; + z-index: -1; +} + +.gsc-branding { + display: none; } div.content-wrapper { @@ -155,7 +174,8 @@ div.related a { } div.rel { - padding: 15px 15px 0 15px; + text-align: center; + margin-top: 20px; } div.sphinxsidebar h3, @@ -165,13 +185,13 @@ div.sphinxsidebar h4 { background-color: #BED4EB; font-weight: normal; color: #212224; - margin: 20px; + margin: 30px 20px 0; border: 1px solid #CCC; } div.sphinxsidebar p { - padding: 5px 20px; + padding: 0px 20px; } div.sphinxsidebar p.topless { @@ -189,7 +209,7 @@ div.sphinxsidebar ul ul { div.sphinxsidebar { - width: 170px; + width: 200px; float: left; margin-left: 0; background-color: inherit; @@ -198,11 +218,10 @@ div.sphinxsidebar { border-top-width: 0; border-left-width: 0; border-bottom-width: 0; - margin-top: 20px; + margin-top: 5px; } div.sphinxsidebar h3 { - margin-top: 10px; text-align: center; font-size: 16px; } @@ -223,6 +242,7 @@ input { text-shadow: none; font-family: Arial; font-size: 1em; + padding: 3px; } div.sphinxsidebar input[type=text]{ diff --git a/doc/whats_new.rst b/doc/whats_new.rst index 6d65d13a091f9f43e6369ff3e6d6dad0f284dce3..a442d905faeb5167af40da58e7daa4fcb917d2d2 100644 --- a/doc/whats_new.rst +++ b/doc/whats_new.rst @@ -2,6 +2,9 @@ 0.4 === +Changelog +--------- + Major changes in this release include: - Coordinate Descent algorithm (Lasso, ElasticNet) refactoring &