diff --git a/harp.json b/harp.json
index 35baaf710e..60883c6753 100644
--- a/harp.json
+++ b/harp.json
@@ -1,7 +1,8 @@
{
"globals": {
"title": "Angular",
- "description": "Angular is a modern javascript framework for building professional web applications.",
+ "description": "Angular is a development platform for building mobile and desktop web applications",
+ "siteURL": "http://angular.io",
"jsLatest": "2.0.0-alpha.11",
"dartLatest": "2.0.0-alpha.11",
diff --git a/public/_includes/_search-box.jade b/public/_includes/_search-box.jade
new file mode 100644
index 0000000000..1c07b5a20a
--- /dev/null
+++ b/public/_includes/_search-box.jade
@@ -0,0 +1,12 @@
+gcse:search(type="search" placeholder="SEARCH DOCS...")
+script
+ (function() {
+ var cx = '008420607850170258613:8o7h40u0v68';
+ var gcse = document.createElement('script');
+ gcse.type = 'text/javascript';
+ gcse.async = true;
+ gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+ '//www.google.com/cse/cse.js?cx=' + cx;
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(gcse, s);
+ })();
\ No newline at end of file
diff --git a/public/_includes/_social-icons.jade b/public/_includes/_social-icons.jade
index dfb8f3420a..1e7f6d9f06 100644
--- a/public/_includes/_social-icons.jade
+++ b/public/_includes/_social-icons.jade
@@ -1,4 +1,7 @@
.social-icons
- a(href="#")
- a(href="#")
- a(href="#")
\ No newline at end of file
+ button(onClick="window.open('https://www.facebook.com/sharer/sharer.php?u=#{siteURL}', '', 'height=500, width=600')" data-href="#{siteURL}" data-colorscheme="dark" data-layout="button_count" data-action="like" data-show-faces="false")
+ button(onClick="window.open('https://twitter.com/share?text=Angular%20-%20#{description}', '', 'height=250, width=600')")
+ button(onClick="window.open('https://plus.google.com/share?url=#{siteURL}', '', 'height=500, width=600')" class="googleplus")
+ button(onClick="window.open('http://www.linkedin.com/shareArticle?mini=true&url=#{siteURL}&title=Angular&summary=#{description}.', '', 'height=625, width=500')")
+
+p(style="color: black;") #{url}
\ No newline at end of file
diff --git a/public/_includes/_version-dropdown.jade b/public/_includes/_version-dropdown.jade
index 8e8a2cc05b..2d86f2af96 100644
--- a/public/_includes/_version-dropdown.jade
+++ b/public/_includes/_version-dropdown.jade
@@ -1,29 +1,41 @@
language = current.path[1]
-version = current.path[2]
-title = "Some Version"
+title = "Javascript "
+filter = /(\.html$)/
+replace = /(\.html$)|(^index\.html$)/
+
+version = current.path[2].replace(/\_+/gm, ".")
+
+
+
+mixin tree(directory, urlPrefix, name)
+ ul
+ for val, key in directory
+ if key !== '.git' && key !== '_data'
+ li #{name} #{key}
+
+
+
if language == 'js'
if version == "latest"
title = 'Javascript ' + jsLatest
+ else
+ title = 'Javascript ' + version
+
if language == 'dart'
if version == "latest"
title = 'Dart ' + dartLatest
+ else
+ title = 'Dart ' + version
-filter = /(\.html$)/
-replace = /(\.html$)|(^index\.html$)/
-
-mixin tree(head, tail)
- for val, key in head
- if key !== '.git' && key !== '_data'
- li #{key}
-
-
-mixin tree(public.docs.js, "")
-mixin tree(public.docs.dart, "")
-
-
+
h2.hero-subtitle.text-subhead
button(md-button ng-click="showVersionMenu($event)") #{title}
+
+
+nav.dropdown
+ mixin tree(public.docs.js, "/docs/js", "Javascript")
+ mixin tree(public.docs.dart, "/docs/dart", "Dart")
\ No newline at end of file
diff --git a/public/resources/css/module/_hero.scss b/public/resources/css/module/_hero.scss
index 0e80a455a4..17fec037f6 100644
--- a/public/resources/css/module/_hero.scss
+++ b/public/resources/css/module/_hero.scss
@@ -43,12 +43,16 @@ $hero-padding: $unit * 2;
right: $unit * 3;
z-index: $layer-1;
- a {
+ button {
color: $snow;
opacity: .56;
font-size: 18px;
text-decoration: none;
margin-left: $unit * 2;
+ padding: 0;
+ background: none;
+ border: none;
+ outline: none;
}
}
diff --git a/public/resources/css/vendor/icomoon/fonts/icomoon.eot b/public/resources/css/vendor/icomoon/fonts/icomoon.eot
index db20439971..f3f224b9a6 100755
Binary files a/public/resources/css/vendor/icomoon/fonts/icomoon.eot and b/public/resources/css/vendor/icomoon/fonts/icomoon.eot differ
diff --git a/public/resources/css/vendor/icomoon/fonts/icomoon.svg b/public/resources/css/vendor/icomoon/fonts/icomoon.svg
index db4a0167ca..56511d243b 100755
--- a/public/resources/css/vendor/icomoon/fonts/icomoon.svg
+++ b/public/resources/css/vendor/icomoon/fonts/icomoon.svg
@@ -50,9 +50,11 @@
+
+
\ No newline at end of file
diff --git a/public/resources/css/vendor/icomoon/fonts/icomoon.ttf b/public/resources/css/vendor/icomoon/fonts/icomoon.ttf
index 5cb6479ce2..b8f33b7112 100755
Binary files a/public/resources/css/vendor/icomoon/fonts/icomoon.ttf and b/public/resources/css/vendor/icomoon/fonts/icomoon.ttf differ
diff --git a/public/resources/css/vendor/icomoon/fonts/icomoon.woff b/public/resources/css/vendor/icomoon/fonts/icomoon.woff
index 167cbb6ce8..72fbf1f416 100755
Binary files a/public/resources/css/vendor/icomoon/fonts/icomoon.woff and b/public/resources/css/vendor/icomoon/fonts/icomoon.woff differ
diff --git a/public/resources/css/vendor/icomoon/selection.json b/public/resources/css/vendor/icomoon/selection.json
index eb21ebdaeb..7068cea48e 100755
--- a/public/resources/css/vendor/icomoon/selection.json
+++ b/public/resources/css/vendor/icomoon/selection.json
@@ -142,6 +142,33 @@
"setIdx": 0,
"iconIdx": 402
},
+ {
+ "icon": {
+ "paths": [
+ "M852 0h-680c-94.6 0-172 77.4-172 172v680c0 94.6 77.4 172 172 172h680c94.6 0 172-77.4 172-172v-680c0-94.6-77.4-172-172-172zM384 832h-128v-448h128v448zM320 320c-35.346 0-64-28.654-64-64s28.654-64 64-64 64 28.654 64 64-28.654 64-64 64zM832 832h-128v-256c0-35.346-28.654-64-64-64s-64 28.654-64 64v256h-128v-448h128v79.472c26.398-36.264 66.752-79.472 112-79.472 79.53 0 144 71.634 144 160v288z"
+ ],
+ "attrs": [],
+ "isMulticolor": false,
+ "tags": [
+ "linkedin",
+ "brand",
+ "social"
+ ],
+ "defaultCode": 58575,
+ "grid": 16
+ },
+ "attrs": [],
+ "properties": {
+ "order": 55,
+ "id": 1581,
+ "prevSize": 32,
+ "code": 60104,
+ "ligatures": "linkedin, brand63",
+ "name": "linkedin"
+ },
+ "setIdx": 0,
+ "iconIdx": 456
+ },
{
"icon": {
"paths": [
@@ -718,6 +745,29 @@
"setIdx": 1,
"iconIdx": 204
},
+ {
+ "icon": {
+ "paths": [
+ "M853.333 170.667h-682.667c-46.933 0-84.907 38.4-84.907 85.333l-0.427 512c0 46.933 38.4 85.333 85.333 85.333h682.667c46.933 0 85.333-38.4 85.333-85.333v-512c0-46.933-38.4-85.333-85.333-85.333zM640 768h-469.333v-170.667h469.333v170.667zM640 554.667h-469.333v-170.667h469.333v170.667zM853.333 768h-170.667v-384h170.667v384z"
+ ],
+ "attrs": [],
+ "isMulticolor": false,
+ "tags": [
+ "web"
+ ],
+ "grid": 24
+ },
+ "attrs": [],
+ "properties": {
+ "id": 213,
+ "order": 56,
+ "prevSize": 24,
+ "code": 58923,
+ "name": "web"
+ },
+ "setIdx": 1,
+ "iconIdx": 213
+ },
{
"icon": {
"paths": [
diff --git a/public/resources/css/vendor/icomoon/style.css b/public/resources/css/vendor/icomoon/style.css
index ad0a4d6abe..056efd3890 100755
--- a/public/resources/css/vendor/icomoon/style.css
+++ b/public/resources/css/vendor/icomoon/style.css
@@ -1,10 +1,10 @@
@font-face {
font-family: 'icomoon';
- src:url('fonts/icomoon.eot?ay41rv');
- src:url('fonts/icomoon.eot?#iefixay41rv') format('embedded-opentype'),
- url('fonts/icomoon.woff?ay41rv') format('woff'),
- url('fonts/icomoon.ttf?ay41rv') format('truetype'),
- url('fonts/icomoon.svg?ay41rv#icomoon') format('svg');
+ src:url('fonts/icomoon.eot?ff1o1p');
+ src:url('fonts/icomoon.eot?#iefixff1o1p') format('embedded-opentype'),
+ url('fonts/icomoon.woff?ff1o1p') format('woff'),
+ url('fonts/icomoon.ttf?ff1o1p') format('truetype'),
+ url('fonts/icomoon.svg?ff1o1p#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -43,6 +43,10 @@
content: "\ea92";
}
+.icon-linkedin:before {
+ content: "\eac8";
+}
+
.icon-accessibility:before {
content: "\e614";
}
@@ -143,6 +147,10 @@
content: "\e61d";
}
+.icon-web:before {
+ content: "\e62b";
+}
+
.icon-call-split:before {
content: "\e61e";
}
diff --git a/public/resources/images/logos/license/open-sourcesvg .svg b/public/resources/images/logos/license/open-sourcesvg .svg
new file mode 100644
index 0000000000..45144715ef
--- /dev/null
+++ b/public/resources/images/logos/license/open-sourcesvg .svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file