Skip to content

Commit c82687e

Browse files
heathermillerheathermiller
committed
Merge pull request scala#494 from algolia/master
Autocomplete search: Improvements, again
2 parents 6186cdb + 75717b3 commit c82687e

File tree

12 files changed

+167
-379
lines changed

12 files changed

+167
-379
lines changed

‎_includes/cheatsheet-header.txt‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
<!-- Bootstrap JS and CSS -->
2121
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
2222
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
23-
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
24-
23+
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
24+
2525
<!-- Base stylesheet for all pages -->
2626
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />
27+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" />
28+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/search.css" type="text/css" />
2729

2830
<!-- table of contents js -->
2931
<script src="{{ site.baseurl }}/resources/javascript/toc.js" type="text/javascript" ></script>
@@ -46,29 +48,29 @@
4648

4749
<!-- prettyprint js to prepend generated pre/code tags -->
4850
<script type="text/javascript">
49-
function styleCode()
51+
function styleCode()
5052
{
51-
if (typeof disableStyleCode != "undefined")
53+
if (typeof disableStyleCode != "undefined")
5254
{
5355
return;
5456
}
5557
var a = false;
56-
$("pre code").parent().each(function()
58+
$("pre code").parent().each(function()
5759
{
58-
if (!$(this).hasClass("prettyprint"))
60+
if (!$(this).hasClass("prettyprint"))
5961
{
6062
$(this).addClass("prettyprint lang-scala linenums");
6163
a = true
6264
}
6365
});
64-
if (a) { prettyPrint() }
66+
if (a) { prettyPrint() }
6567
}
6668
</script>
6769

6870
<script type="text/javascript">
6971
jQuery(document).ready(function($) {
70-
71-
$(".scroll").click(function(event){
72+
73+
$(".scroll").click(function(event){
7274
event.preventDefault();
7375
$('html,body').animate({scrollTop:$(this.hash).offset().top}, 500);
7476
$('html,body').animate({scrollTop:$(this.hash).offset().top-=50}, 500);
@@ -78,7 +80,7 @@
7880

7981
<script type="text/javascript">
8082
jQuery(document).ready(function($) {
81-
83+
8284
$(".bottom table tr").hover(
8385
function(){$(this).css("background-color", "#FFCC85");},
8486
function(){$(this).css("background-color", "#ffffff");}
@@ -88,9 +90,9 @@
8890

8991
<style type="text/css">
9092
html, body {
91-
padding-top: 36px;
93+
padding-top: 36px;
9294
height: 100%;
93-
background:url({{ site.baseurl }}/resources/images/bg-short.jpg) no-repeat top center #310808;
95+
background:url({{ site.baseurl }}/resources/images/bg-short.jpg) no-repeat top center #310808;
9496
-webkit-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
9597
-moz-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
9698
/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3);*/
@@ -100,7 +102,7 @@
100102
margin-left: auto;
101103
margin-right: auto;
102104
height: 70px;
103-
zoom: 1;
105+
zoom: 1;
104106
}
105107
.scrollingmenu h1 {
106108
padding-bottom: 30px;
@@ -219,21 +221,21 @@
219221
-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);
220222
box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);
221223
}
222-
224+
223225
.box h2 {
224226
padding-bottom: 8px;
225227
color: #ffffff;
226228
font-size: 36px;
227229
line-height: 1;
228-
text-shadow: 0 1px 2px rgba(0,0,0,.5);
230+
text-shadow: 0 1px 2px rgba(0,0,0,.5);
229231
}
230-
232+
231233
.box h3 {
232234
padding-bottom: 8px;
233235
color: #ffffff;
234236
font-size: 24px;
235237
line-height: 1;
236-
text-shadow: 0 1px 2px rgba(0,0,0,.5);
238+
text-shadow: 0 1px 2px rgba(0,0,0,.5);
237239
}
238240

239241
.box ul li {
@@ -245,8 +247,8 @@
245247
font-weight: bold;
246248
font-size: 26px;
247249
line-height: 36px;
248-
text-shadow: 0 1px 2px rgba(0,0,0,.5);
249-
margin: 0 0 0 150px;
250+
text-shadow: 0 1px 2px rgba(0,0,0,.5);
251+
margin: 0 0 0 150px;
250252
}
251253

252254
.box ul li a {
@@ -324,7 +326,7 @@
324326
}
325327

326328
div#scroller h6 {
327-
padding-left: 14px;
329+
padding-left: 14px;
328330
}
329331

330332
p#about {
@@ -335,7 +337,7 @@
335337
input, textarea, select, .uneditable-input {
336338
width: 165px;
337339
}
338-
340+
339341
.bottom p.under {
340342
color: #808080;
341343
text-shadow: 0 1px 1px rgba(255,255,255,.5);

‎_includes/contributing-header.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
<!-- Bootstrap JS and CSS -->
2424
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
2525
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
26-
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
26+
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
2727

2828
<!-- Base stylesheet for all pages -->
2929
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />
30+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" />
31+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/search.css" type="text/css" />
32+
3033

3134
<!-- You may want to change the paths below, according to your own CSS and JavaScript setup -->
3235
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.easing.js"></script>
@@ -54,29 +57,29 @@
5457

5558
<!-- prettyprint js to prepend generated pre/code tags -->
5659
<script type="text/javascript">
57-
function styleCode()
60+
function styleCode()
5861
{
59-
if (typeof disableStyleCode != "undefined")
62+
if (typeof disableStyleCode != "undefined")
6063
{
6164
return;
6265
}
6366
var a = false;
64-
$("pre code").parent().each(function()
67+
$("pre code").parent().each(function()
6568
{
66-
if (!$(this).hasClass("prettyprint"))
69+
if (!$(this).hasClass("prettyprint"))
6770
{
6871
$(this).addClass("prettyprint lang-scala linenums");
6972
a = true
7073
}
7174
});
72-
if (a) { prettyPrint() }
75+
if (a) { prettyPrint() }
7376
}
7477
</script>
7578

7679
<script type="text/javascript">
7780
jQuery(document).ready(function($) {
7881

79-
$(".scroll").click(function(event){
82+
$(".scroll").click(function(event){
8083
event.preventDefault();
8184
$('html,body').animate({scrollTop:$(this.hash).offset().top}, 500);
8285
$('html,body').animate({scrollTop:$(this.hash).offset().top-=50}, 500);
@@ -88,9 +91,9 @@
8891

8992
<style type="text/css">
9093
html, body {
91-
padding-top: 36px;
94+
padding-top: 36px;
9295
height: 100%;
93-
background:url({{ site.baseurl }}/resources/images/bg-short.jpg) no-repeat top center #310808;
96+
background:url({{ site.baseurl }}/resources/images/bg-short.jpg) no-repeat top center #310808;
9497
-webkit-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
9598
-moz-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
9699
/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3);*/
@@ -99,13 +102,13 @@
99102
input, textarea, select, .uneditable-input {
100103
width: 165px;
101104
}
102-
105+
103106
.scrollingmenu {
104107
width: 940px;
105108
margin-left: auto;
106109
margin-right: auto;
107110
height: 70px;
108-
zoom: 1;
111+
zoom: 1;
109112
}
110113
.scrollingmenu h1 {
111114
padding-bottom: 30px;

‎_includes/footerbar.txt‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<li><h5>Learn</h5></li>
1010
<li><a href="{{ site.baseurl }}/overviews">Guides & Overviews</a></li>
1111
<li><a href="{{ site.baseurl }}/tutorials">Tutorials</a></li>
12-
<li><a href="{{ site.baseurl }}/style">Scala Style Guide</a></li>
12+
<li><a href="{{ site.baseurl }}/style">Scala Style Guide</a></li>
1313
</ul>
1414
<ul>
1515
<li><h5>Quickref</h5></li>
@@ -20,23 +20,34 @@
2020
<li><h5>Contribute</h5></li>
2121
<li><a href="http://github.com/scala/scala.github.com">Source Code</a></li>
2222
<li><a href="{{ site.baseurl }}/contribute.html">Contributors Guide</a></li>
23-
<li><a href="http://getsatisfaction.com/scaladocs">Suggestions</a></li>
23+
<li><a href="http://getsatisfaction.com/scaladocs">Suggestions</a></li>
2424
</ul>
2525
<ul>
2626
<li><h5>Other Resources</h5></li>
27-
<li><a href="{{ site.baseurl }}/sips">Scala Improvement Process</a></li>
28-
</ul>
27+
<li><a href="{{ site.baseurl }}/sips">Scala Improvement Process</a></li>
28+
</ul>
2929
</div>
3030
<div class="container copyright">
3131
<p>
3232
Copyright &copy; 2011-2015 EPFL. All rights reserved.
3333
<a href="https://github.com/scala/scala.github.com/commits/gh-pages.atom"><img align="right" height="20px" width="20px" src="{{ site.baseurl }}/resources/images/rss.png" alt="RSS feed of updates to the github repo hosting this site"></a>
34-
</p>
34+
</p>
3535
</div>
3636
</div>
3737

3838
<!-- search -->
39-
<script src="//cdn.jsdelivr.net/algoliasearch/3/algoliasearch.min.js"></script>
40-
<script src="//cdn.jsdelivr.net/autocomplete.js/0/autocomplete.min.js"></script>
41-
<script src="{{ site.baseurl }}/resources/javascript/searchbar.js" type="text/javascript" ></script>
39+
<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
40+
<script type="text/javascript"> docsearch({
41+
apiKey: 'b66eaeec6bd214ea6c0fcd2d7b7fdfe8',
42+
indexName: 'scala-docs',
43+
inputSelector: '#q',
44+
autocompleteOptions: {
45+
debug: true
46+
},
47+
algoliaOptions: {
48+
"hitsPerPage": 5,
49+
"facetFilters": "(tags:en)"
50+
}
51+
});
52+
</script>
4253

‎_includes/frontpage-header.txt‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@
2020
<!-- Bootstrap JS and CSS -->
2121
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
2222
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
23-
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
23+
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
2424

2525
<!-- Base stylesheet for all pages -->
2626
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />
27+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" />
28+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/search.css" type="text/css" />
29+
2730

2831
<!-- You may want to change the paths below, according to your own CSS and JavaScript setup -->
2932
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/resources/stylesheets/frontpage.css" />
@@ -50,13 +53,13 @@
5053
<script type="text/javascript">
5154

5255
$(document).ready(function() {
53-
56+
5457
var offset = $(".push").height() + $(".scrollingmenu").height() + 36;
5558
if ( offset + $('.bottom').height() < $(window).height() ) {
5659
var height = $(window).height() - offset;
57-
$('.bottom').css("height", height);
60+
$('.bottom').css("height", height);
5861
}
59-
62+
6063
});
6164
</script>
6265

@@ -66,9 +69,9 @@
6669
}
6770

6871
body {
69-
padding-top: 36px;
70-
height: 100%;
71-
background:url({{ site.baseurl }}/resources/images/bg.jpg) no-repeat top center #310808;
72+
padding-top: 36px;
73+
height: 100%;
74+
background:url({{ site.baseurl }}/resources/images/bg.jpg) no-repeat top center #310808;
7275
-webkit-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
7376
-moz-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
7477
/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3);*/
@@ -78,7 +81,7 @@
7881
margin-left: auto;
7982
margin-right: auto;
8083
height: 280px;
81-
zoom: 1;
84+
zoom: 1;
8285
}
8386
.scrollingmenu h2 {
8487
padding-bottom: 30px;
@@ -99,19 +102,19 @@
99102
color: #404040;
100103
text-shadow: 0 1px 2px rgba(255,255,255,.5);
101104
}
102-
105+
103106
.bottom h3 .label {
104107
text-shadow: 0 0 0 rgba(255,255,255,.5);
105108
}
106109

107110
ul.dsq-widget-item {
108111
list-style:none;
109112
}
110-
113+
111114
li.dsq-widget-item a {
112-
color: #48a2ff;
115+
color: #48a2ff;
113116
}
114-
117+
115118
li.dsq-widget-item {
116119
background: rgba(0,0,0,.7); /* Old browsers */
117120
background: -moz-linear-gradient(top, rgba(0,0,0,.7) 1%, rgba(0,0,0,.7) 100%); /* FF3.6+ */
@@ -142,7 +145,7 @@
142145
display: block;
143146
width: 0;
144147
}
145-
148+
146149

147150
</style>
148151

0 commit comments

Comments
 (0)