Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 5732b07

Browse files
alexwolfenaomiblack
authored andcommitted
Upgrade swiftype to 2.0 library and added a results page for searches
1 parent cdfe957 commit 5732b07

File tree

12 files changed

+110
-34
lines changed

12 files changed

+110
-34
lines changed

public/_includes/_scripts-include.jade

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,4 @@ script(src="/resources/js/directives/code-example.js")
3737
script(src="/resources/js/directives/if-docs.js")
3838
script(src="/resources/js/directives/live-example.js")
3939
script(src="/resources/js/directives/ngio-ex-path.js")
40-
script(src="/resources/js/directives/scroll-y-offset-element.js")
41-
42-
<!-- GA -->
43-
script.
44-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
45-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
46-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
47-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
48-
49-
ga('create', 'UA-8594346-15', 'auto');
50-
ga('send', 'pageview')
51-
52-
53-
if current.path[0] == "docs"
54-
<!-- SWIFTYPE -->
55-
script.
56-
(function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){
57-
(w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t);
58-
e=d.getElementsByTagName(t)[0];s.async=1;s.src=u;e.parentNode.insertBefore(s,e);
59-
})(window,document,'script','//s.swiftypecdn.com/install/v1/st.js','_st');
60-
61-
_st('install','VsuU7kH5Hnnj9tfyNvfK');
62-
63-
<!-- Google Feedback -->
64-
script(src="//www.gstatic.com/feedback/api.js" type="text/javascript")
65-
66-
<!-- Twitter Widget -->
67-
script.
68-
(function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}})(document,"script","twitter-wjs");
40+
script(src="/resources/js/directives/scroll-y-offset-element.js")
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!-- GA -->
2+
script.
3+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
4+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
5+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
6+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
7+
8+
ga('create', 'UA-8594346-15', 'auto');
9+
ga('send', 'pageview')
10+
11+
<!-- SWIFTYPE -->
12+
if current.path[0] == "docs" || current.path[0] == "search"
13+
script.
14+
(function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){
15+
(w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t);
16+
e=d.getElementsByTagName(t)[0];s.async=1;s.src=u;e.parentNode.insertBefore(s,e);
17+
})(window,document,'script','//s.swiftypecdn.com/install/v2/st.js','_st');
18+
19+
_st('install','VsuU7kH5Hnnj9tfyNvfK','2.0.0');
20+
21+
22+
<!-- Google Feedback -->
23+
script(src="//www.gstatic.com/feedback/api.js" type="text/javascript")
24+
25+
<!-- Twitter Widget -->
26+
script.
27+
(function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}})(document,"script","twitter-wjs");

public/_layout.jade

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ html(lang="en" ng-app="angularIOApp" itemscope itemtype="http://schema.org/Frame
1919
!= yield
2020

2121
!= partial("/_includes/_footer")
22-
!= partial("/_includes/_scripts-include")
22+
!= partial("/_includes/_scripts-include")
23+
!= partial("/_includes/_scripts-minimum")

public/docs/_includes/_side-nav.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
nav(class="sidenav l-pinned-left l-layer-4 l-offset-nav" ng-class="appCtrl.showDocsNav ? 'is-visible' : ''")
6464
// SEARCH BAR
6565
header.sidenav-search.st-input-wrapper
66-
form.st-input-inner
66+
.st-input-inner
6767
label(for="search-io" class="is-hidden") Search Docs
68-
input(type="search" id="search-io" placeholder="SEARCH DOCS...")
68+
input(type="text" class="st-default-search-input" placeholder="SEARCH DOCS...")
6969
button(class="mobile-trigger button" aria-label="View Docs Menu" ng-click="appCtrl.toggleDocsMenu($event)" md-button) Docs <span class="icon icon-arrow-drop-down"></span>
7070

7171
ul(class="sidenav-links")

public/docs/_layout-dart-api.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,4 @@ else
4949

5050
include ../_includes/_footer
5151
include ../_includes/_scripts-include
52+
include ../_includes/_scripts-minimum

public/docs/_layout.jade

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if jade2ng
55
!= partial("../_includes/_hero")
66
!= partial("../_includes/_banner")
77
.l-content-small.grid-fluid.docs-content
8-
!= yield
8+
!= yield
99
else
1010
doctype
1111
html(lang="en" ng-app="angularIOApp" itemscope itemtype="http://schema.org/Framework")
@@ -41,4 +41,5 @@ else
4141
!= partial("../_includes/_next-item")
4242

4343
!= partial("../_includes/_footer")
44-
!= partial("../_includes/_scripts-include")
44+
!= partial("../_includes/_scripts-include")
45+
!= partial("../_includes/_scripts-minimum")

public/resources/css/main.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
@import 'module/card';
4949
@import 'module/hover-card';
5050
@import 'module/modal';
51+
@import 'module/search';
5152
@import 'module/shadow';
5253
@import 'module/showcase';
5354
@import 'module/statement';
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Search Module
3+
*
4+
* Module for search input and results
5+
*
6+
*/
7+
8+
9+
/*
10+
* Variables
11+
*/
12+
13+
$unit: 8px !default;
14+
$search-field: '.search-field';
15+
$search-results: '.search-results';
16+
$search-height: 104px;
17+
$search-width: 752px;
18+
19+
20+
/*
21+
* Class
22+
*/
23+
24+
#{$search-results} {
25+
26+
#{$search-field} {
27+
background: $white;
28+
border: 1px solid $blue-grey-100;
29+
border-radius: 2px;
30+
box-sizing: border-box;
31+
color: $blue-grey-500;
32+
font-size: 16px;
33+
height: $unit * 5;
34+
margin-bottom: $unit * 4;
35+
padding: 0 $unit;
36+
width: 100%;
37+
38+
&:active,
39+
&:focus {
40+
background: rgba($amber-50, .24);
41+
border: 1px solid $blue-500;
42+
color: $blue-500;
43+
}
44+
}
45+
46+
47+
}

public/resources/css/module/_side-nav.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ $sidenav-width: 240px;
8080
}
8181

8282
input {
83+
background: $white;
8384
border: none;
8485
border-radius: 200px;
8586
box-sizing: border-box;

public/search/_data.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"index": {
3+
"title": "Search Results",
4+
"subtitle": "Developer Documentation"
5+
}
6+
}

public/search/_layout.jade

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
doctype html public
2+
html(lang="en")
3+
head
4+
!= partial("../_includes/_head-include")
5+
6+
body.l-offset-nav
7+
!= partial("../_includes/_main-nav")
8+
!= partial("../_includes/_hero")
9+
10+
11+
12+
article(class="l-docs-content")
13+
!= yield
14+
15+
!= partial("../_includes/_footer")
16+
!= partial("../_includes/_scripts-minimum")

public/search/index.jade

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.search-results
2+
input(type="text" class="st-default-search-input search-field" placeholder="SEARCH DOCS...")
3+
.st-search-container

0 commit comments

Comments
 (0)