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/_footer.jade b/public/_includes/_footer.jade
index 820b2eb17f..08d00c34ba 100644
--- a/public/_includes/_footer.jade
+++ b/public/_includes/_footer.jade
@@ -41,4 +41,4 @@
footer(class="background-steel")
- small.text-caption Powered by Google ©2010-2015. Code licensed under the The MIT License. Documentation licensed under CC BY 3.0.
\ No newline at end of file
+ small.text-caption Powered by Google ©2010-2015. Code licensed under the The Apache License, Version 2.0. Documentation licensed under CC BY 3.0.
\ No newline at end of file
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 e7865bf6da..e77e805f0c 100644
--- a/public/_includes/_version-dropdown.jade
+++ b/public/_includes/_version-dropdown.jade
@@ -1,15 +1,45 @@
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, latest)
+ ul
+ for val, semvar in directory
+ if semvar !== '.git' && semvar !== '_data'
+ libVersion = (semvar == "latest") ? latest : semvar.replace(/\_+/gm, ".")
+ li #{name} #{libVersion}
+
+
+
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
-h2.hero-subtitle.text-subhead
- button(md-button ng-click="showVersionMenu($event)") #{title}
+
+nav.hero-subtitle.text-subhead.dropdown
+ button(md-button class="dropdown-button" ng-click="toggleVersionMenu($event)") #{title}
+ div(class="overlay ng-hide" ng-click="toggleVersionMenu($event)" ng-show="showMenu")
+
+
+ div(class="dropdown-menu ng-hide" ng-show="showMenu")
+ mixin tree(public.docs.js, "/docs/js", "Javascript", jsLatest)
+ mixin tree(public.docs.dart, "/docs/dart", "Dart", dartLatest)
+ ul
+ li #{name} Angular 1.X
+ li #{name} AngularDart 1.X
diff --git a/public/features.jade b/public/features.jade
index b3ebaece01..4f6fd97f1a 100644
--- a/public/features.jade
+++ b/public/features.jade
@@ -74,7 +74,7 @@
.grid-fluid.l-space-bottom-8
.c3.text-center
- .sticker
+ .sticker
.c7
h3.text-headline.text-uppercase Support for Web Components
p.text-body Angular 2 plays nicely with web components built using other libraries (Polymer, X-Tag and others), allowing you to pass data into them as easily as into Angular-native components. Angular components use web standards (e.g. shadow DOM and the HTML5 template tag) in browsers that support them.
diff --git a/public/index.jade b/public/index.jade
index f41ba8784f..4a72e2d05c 100644
--- a/public/index.jade
+++ b/public/index.jade
@@ -16,10 +16,10 @@
.grid-fluid.l-space-bottom-8
.c7
- h3.text-headline Open Source & MIT Licensed
+ h3.text-headline Powered By The Open Source Community
p.text-body Angular is built by you, for you. Our community shapes Angular's direction: core contributions come from big companies and small ones, from students and independent experts. We do our work in the open so that you can help Angular improve, or extend and modify what we've built.
.c5.text-center
- img(src="/resources/images/logos/license/mit.png")
+ img(src="/resources/images/logos/license/open-source.png")
diff --git a/public/resources/css/_state.scss b/public/resources/css/_state.scss
index e69de29bb2..dcaa44b108 100644
--- a/public/resources/css/_state.scss
+++ b/public/resources/css/_state.scss
@@ -0,0 +1,3 @@
+.is-hidden {
+ display: none !important;
+}
\ No newline at end of file
diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss
index 8115d631e5..6cd3b37365 100644
--- a/public/resources/css/main.scss
+++ b/public/resources/css/main.scss
@@ -19,6 +19,7 @@
@import 'module/top-nav';
@import 'module/side-nav';
@import 'module/footer';
+@import 'module/dropdown';
@import 'module/hero';
@import 'module/banner';
@import 'module/cta-bar';
@@ -26,6 +27,7 @@
@import 'module/code';
@import 'module/sticker';
@import 'module/bio-card';
+@import 'module/overlay';
/*
diff --git a/public/resources/css/module/_banner.scss b/public/resources/css/module/_banner.scss
index 18ba92bf8d..e247c69ef4 100644
--- a/public/resources/css/module/_banner.scss
+++ b/public/resources/css/module/_banner.scss
@@ -23,6 +23,7 @@
h3 {
opacity: .87;
line-height: 34px;
+ margin: 0;
}
h4 {
diff --git a/public/resources/css/module/_code.scss b/public/resources/css/module/_code.scss
index 3f5cbfcdb7..8f4e1ab4c7 100644
--- a/public/resources/css/module/_code.scss
+++ b/public/resources/css/module/_code.scss
@@ -50,7 +50,7 @@
margin-bottom: 5px;
line-height: normal;
list-style-type: decimal;
- font-size: 14px;
+ font-size: 12px;
&:last-child {
margin-bottom: 0px;
diff --git a/public/resources/css/module/_dropdown.scss b/public/resources/css/module/_dropdown.scss
new file mode 100644
index 0000000000..f63d7b569b
--- /dev/null
+++ b/public/resources/css/module/_dropdown.scss
@@ -0,0 +1,48 @@
+.dropdown {
+ position: relative;
+ z-index: $layer-5;
+
+ .dropdown-button {
+ background: none;
+ border: none;
+ text-transform: none;
+ font-weight: normal;
+ line-height: $unit * 4;
+ padding: 0px $unit;
+ cursor: pointer;
+ }
+
+ .dropdown-menu {
+ background: $snow;
+ box-shadow: 0px 2px 5px rgba($coal, .3);
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ z-index: $layer-5;
+
+ ul {
+ list-style-type: none;
+ margin: 0px 0px ($unit * 2) 0px;
+ padding: 0px;
+
+ &:last-child {
+ margin: 0;
+ }
+ }
+
+ li {
+ margin: 0px;
+ }
+
+ a {
+ display: block;
+ line-height: $unit * 5;
+ padding: 0px ($unit * 2);
+ font-size: 14px;
+ text-decoration: none;
+ text-align: left;
+ font-weight: 400;
+ text-transform: uppercase;
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/resources/css/module/_footer.scss b/public/resources/css/module/_footer.scss
index f79dd93af3..dc667b6a56 100644
--- a/public/resources/css/module/_footer.scss
+++ b/public/resources/css/module/_footer.scss
@@ -13,9 +13,9 @@
}
.logo-inverse-large {
- background: url('/resources/images/logos/inverse/shield/128.png') 0px 0px no-repeat;
- height: 128px;
- width: 128px;
+ background: url('/resources/images/logos/inverse/shield/shield-large.png') 0px 0px no-repeat;
+ height: 200px;
+ width: 200px;
}
ul {
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/module/_overlay.scss b/public/resources/css/module/_overlay.scss
new file mode 100644
index 0000000000..026a922496
--- /dev/null
+++ b/public/resources/css/module/_overlay.scss
@@ -0,0 +1,8 @@
+.overlay {
+ position: fixed;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
+ z-index: $layer-3;
+}
\ No newline at end of file
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/inverse/shield/shield-large.png b/public/resources/images/logos/inverse/shield/shield-large.png
new file mode 100644
index 0000000000..93f6cb141a
Binary files /dev/null and b/public/resources/images/logos/inverse/shield/shield-large.png differ
diff --git a/public/resources/images/logos/inverse/shield/shield-large.svg b/public/resources/images/logos/inverse/shield/shield-large.svg
new file mode 100644
index 0000000000..619666c456
--- /dev/null
+++ b/public/resources/images/logos/inverse/shield/shield-large.svg
@@ -0,0 +1,21 @@
+
+
\ No newline at end of file
diff --git a/public/resources/images/logos/inverse/shield/shield-large@2x.png b/public/resources/images/logos/inverse/shield/shield-large@2x.png
new file mode 100644
index 0000000000..c170c370c0
Binary files /dev/null and b/public/resources/images/logos/inverse/shield/shield-large@2x.png differ
diff --git a/public/resources/images/logos/license/mit.png b/public/resources/images/logos/license/mit.png
deleted file mode 100644
index 74a6b2737f..0000000000
Binary files a/public/resources/images/logos/license/mit.png and /dev/null differ
diff --git a/public/resources/images/logos/license/mit.svg b/public/resources/images/logos/license/mit.svg
deleted file mode 100644
index 79d9490656..0000000000
--- a/public/resources/images/logos/license/mit.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
\ No newline at end of file
diff --git a/public/resources/images/logos/license/mit@2x.png b/public/resources/images/logos/license/mit@2x.png
deleted file mode 100644
index de4a2e84f6..0000000000
Binary files a/public/resources/images/logos/license/mit@2x.png and /dev/null differ
diff --git a/public/resources/images/logos/license/open-source.png b/public/resources/images/logos/license/open-source.png
new file mode 100644
index 0000000000..a2e6f0a623
Binary files /dev/null and b/public/resources/images/logos/license/open-source.png differ
diff --git a/public/resources/images/logos/license/open-source@2x.png b/public/resources/images/logos/license/open-source@2x.png
new file mode 100644
index 0000000000..1f1301b992
Binary files /dev/null and b/public/resources/images/logos/license/open-source@2x.png differ
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
diff --git a/public/resources/images/logos/standard/shield-large.png b/public/resources/images/logos/standard/shield-large.png
index 2b99bb2803..024ffefcd6 100644
Binary files a/public/resources/images/logos/standard/shield-large.png and b/public/resources/images/logos/standard/shield-large.png differ
diff --git a/public/resources/images/logos/standard/shield-large.svg b/public/resources/images/logos/standard/shield-large.svg
index f3dbc9d134..08c93b7a1e 100644
--- a/public/resources/images/logos/standard/shield-large.svg
+++ b/public/resources/images/logos/standard/shield-large.svg
@@ -6,11 +6,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/public/resources/images/logos/standard/shield-large@2x.png b/public/resources/images/logos/standard/shield-large@2x.png
index c3aaafb5ab..e2de297fe5 100644
Binary files a/public/resources/images/logos/standard/shield-large@2x.png and b/public/resources/images/logos/standard/shield-large@2x.png differ
diff --git a/public/resources/js/site.js b/public/resources/js/site.js
index e6f04c7c0b..d13fbc4df4 100644
--- a/public/resources/js/site.js
+++ b/public/resources/js/site.js
@@ -14,20 +14,16 @@ var angularIO = angular.module('angularIOApp', ['ngMaterial'])
});
});
+
angularIO.controller('AppCtrl', ['$scope', '$mdSidenav', '$mdDialog', function($scope, $mdSidenav, $mdDialog){
$scope.toggleSidenav = function(menuId) {
$mdSidenav(menuId).toggle();
};
- $scope.showVersionMenu = function() {
- $mdDialog.show(
- $mdDialog.alert()
- .title('Choose a Version')
- .content('libraries')
- .ariaLabel('Angular Version Menu')
- .ok('Done')
- .targetEvent(event)
- );
+ $scope.toggleVersionMenu = function(event) {
+ $scope.showMenu = !$scope.showMenu;
+
+ item.toggleClass('is-hidden');
};
$scope.showBio = function (event) {