diff --git a/harp.json b/harp.json
index 83f978a958..f3eac18952 100644
--- a/harp.json
+++ b/harp.json
@@ -1,6 +1,8 @@
{
"globals": {
"title": "Angular",
- "description" : "some description"
+ "description": "Angular is a modern javascript framework for building professional web applications.",
+ "jsVersion": "2_0_0-alpha_11",
+ "dartVersion": "2_0_0-alpha_11"
}
}
\ No newline at end of file
diff --git a/public/_includes/_docs-nav.jade b/public/_includes/_docs-nav.jade
index 95ac679464..ab8cabcfce 100644
--- a/public/_includes/_docs-nav.jade
+++ b/public/_includes/_docs-nav.jade
@@ -2,6 +2,7 @@ nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav
.side-nav-search
input(type="search" placeholder="SEARCH DOCS...")
+
ul.side-nav-primary
- li Quick Start
- li Guide
+ for page, slug in public.docs[current.path[1]][current.path[2]]._data
+ li #{page.title}
diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade
index c8cc71c7c2..20d37eb8eb 100644
--- a/public/_includes/_main-nav.jade
+++ b/public/_includes/_main-nav.jade
@@ -1,11 +1,11 @@
md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5")
nav
- h1 Angular by Google
+ h1 Angular by Google
ul
- li Features
- li Docs
- li About
- li Contribute
+ li Features
+ li Docs
+ li About
+ li Contribute
- a(class="cta main-nav-button has-icon" href="/download.html") Download
\ No newline at end of file
+ a(class="cta main-nav-button has-icon" href="/download.html" md-button) Download
\ No newline at end of file
diff --git a/public/_layout.jade b/public/_layout.jade
index cc7f72bacf..f94acda735 100644
--- a/public/_layout.jade
+++ b/public/_layout.jade
@@ -1,22 +1,19 @@
doctype
html(lang="en" layout="column" ng-app="myApp")
-
head
!= partial("/_includes/_head-include")
body(class="l-offset-nav" ng-controller="AppCtrl")
!= partial("/_includes/_main-nav")
- // INCLUDE HERO
+
if hero == 'home'
!= partial("/_includes/_hero-home")
else
!= partial("/_includes/_hero")
- // PAGE CONTENT
- .l-content
+ article.l-content
!= yield
- // FOOTER & SCRIPTS
!= partial("/_includes/_footer")
!= partial("/_includes/_scripts-include")
\ No newline at end of file
diff --git a/public/docs/_data.jade b/public/docs/_data.jade
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/public/docs/_data.json b/public/docs/_data.json
index 0967ef424b..82e3bd6fc7 100644
--- a/public/docs/_data.json
+++ b/public/docs/_data.json
@@ -1 +1,12 @@
-{}
+{
+ "index": {
+ "title": "Angular Docs",
+ "subtitle": "Choose a language for Angular",
+ "layout": "../_layout"
+ },
+
+ "search": {
+ "title": "Docs Search Results",
+ "layout": "../_layout"
+ }
+}
diff --git a/public/docs/_layout.jade b/public/docs/_layout.jade
index 91f1e13cbb..fc7fbec6a9 100644
--- a/public/docs/_layout.jade
+++ b/public/docs/_layout.jade
@@ -1,10 +1,14 @@
doctype
html(lang="en" layout="column" ng-app="myApp")
head
- != partial("..//_includes/_head-include")
+ != partial("../_includes/_head-include")
body(class="l-offset-nav l-offset-side-nav" ng-controller="AppCtrl")
!= partial("../_includes/_main-nav")
!= partial("../_includes/_docs-nav")
+ != partial("../_includes/_hero")
+
!= yield
+
!= partial("../_includes/_footer")
+ != partial("../_includes/_scripts-include")
\ No newline at end of file
diff --git a/public/docs/_quickstart.jade b/public/docs/_quickstart.jade
deleted file mode 100644
index d409ac8fea..0000000000
--- a/public/docs/_quickstart.jade
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if lang == 'js'
- h2 I like JavaScript
-else if lang == 'dart'
- h2 I like Dart
diff --git a/public/docs/dart/_data.json b/public/docs/dart/_data.json
deleted file mode 100644
index 6f078fc07c..0000000000
--- a/public/docs/dart/_data.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "lang": "dart"
-}
diff --git a/public/docs/dart/quickstart.jade b/public/docs/dart/quickstart.jade
deleted file mode 100644
index 743f5e71ef..0000000000
--- a/public/docs/dart/quickstart.jade
+++ /dev/null
@@ -1,3 +0,0 @@
-h1 Dart Quickstart
-
-!= partial("../_quickstart", public.docs.dart._data)
diff --git a/public/docs/index.jade b/public/docs/index.jade
new file mode 100644
index 0000000000..63c9850bb2
--- /dev/null
+++ b/public/docs/index.jade
@@ -0,0 +1 @@
+h1 path #{current.path[0]}
\ No newline at end of file
diff --git a/public/docs/index.md b/public/docs/index.md
deleted file mode 100644
index 69e3544c68..0000000000
--- a/public/docs/index.md
+++ /dev/null
@@ -1 +0,0 @@
-#Docs home
\ No newline at end of file
diff --git a/public/docs/js/2_0_0-alpha_11/_data.json b/public/docs/js/2_0_0-alpha_11/_data.json
new file mode 100644
index 0000000000..cfdd90e9df
--- /dev/null
+++ b/public/docs/js/2_0_0-alpha_11/_data.json
@@ -0,0 +1,21 @@
+{
+ "index": {
+ "title": "Angular Docs"
+ },
+
+ "quickstart": {
+ "title": "5 Min Quickstart"
+ },
+
+ "resources": {
+ "title": "Angular Resources"
+ },
+
+ "api": {
+ "title": "API Proposal"
+ },
+
+ "help": {
+ "title": "Help & Support"
+ }
+}
\ No newline at end of file
diff --git a/public/docs/js/2_0_0-alpha_11/index.jade b/public/docs/js/2_0_0-alpha_11/index.jade
new file mode 100644
index 0000000000..a6bf4a6b13
--- /dev/null
+++ b/public/docs/js/2_0_0-alpha_11/index.jade
@@ -0,0 +1 @@
+h1 Docs Home for latest version
\ No newline at end of file
diff --git a/public/docs/js/quickstart.jade b/public/docs/js/2_0_0-alpha_11/quickstart.jade
similarity index 100%
rename from public/docs/js/quickstart.jade
rename to public/docs/js/2_0_0-alpha_11/quickstart.jade
diff --git a/public/docs/js/_data.json b/public/docs/js/_data.json
deleted file mode 100644
index d84c9c6eb9..0000000000
--- a/public/docs/js/_data.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "lang": "js"
-}
diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss
index 99c2c7921a..a2ebbdc959 100644
--- a/public/resources/css/main.scss
+++ b/public/resources/css/main.scss
@@ -16,9 +16,9 @@
*
*/
-@import 'module/main-nav';
-@import 'module/main-footer';
+@import 'module/top-nav';
@import 'module/side-nav';
+@import 'module/footer';
@import 'module/hero';
@import 'module/banner';
@import 'module/cta-bar';
diff --git a/public/resources/css/module/_main-footer.scss b/public/resources/css/module/_footer.scss
similarity index 100%
rename from public/resources/css/module/_main-footer.scss
rename to public/resources/css/module/_footer.scss
diff --git a/public/resources/css/module/_main-nav.scss b/public/resources/css/module/_top-nav.scss
similarity index 92%
rename from public/resources/css/module/_main-nav.scss
rename to public/resources/css/module/_top-nav.scss
index 7e8c42b5d0..22110bfcda 100644
--- a/public/resources/css/module/_main-nav.scss
+++ b/public/resources/css/module/_top-nav.scss
@@ -5,16 +5,16 @@
box-shadow: 0px 2px 5px 0 rgba($coal, 0.26);
h1 {
- margin: $unit ($unit * 10) 0px 0px;
+ margin: 0px ($unit * 9) 0px 0px;
padding: 0px;
height: 36px;
width: 135px;
float: left;
a {
- background: url('/resources/images/logos/standard/logo-nav.png');
+ background: url('/resources/images/logos/standard/logo-nav.png') 0px 8px no-repeat;
display: block;
- height: 36px;
+ height: 56px;
width: 135px;
overflow: hidden;
text-indent: -3000px;
diff --git a/public/resources/images/logos/html5/html5 logos.png b/public/resources/images/logos/html5/html5 logos.png
new file mode 100644
index 0000000000..46a689b7d7
Binary files /dev/null and b/public/resources/images/logos/html5/html5 logos.png differ
diff --git a/public/resources/images/logos/html5/html5 logos@2x.png b/public/resources/images/logos/html5/html5 logos@2x.png
new file mode 100644
index 0000000000..785f1056a7
Binary files /dev/null and b/public/resources/images/logos/html5/html5 logos@2x.png differ
diff --git a/public/resources/images/logos/html5/html5 logossvg.svg b/public/resources/images/logos/html5/html5 logossvg.svg
new file mode 100644
index 0000000000..14e2fc25b8
--- /dev/null
+++ b/public/resources/images/logos/html5/html5 logossvg.svg
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/public/resources/images/logos/license/MIT Logo.png b/public/resources/images/logos/license/MIT Logo.png
new file mode 100644
index 0000000000..74a6b2737f
Binary files /dev/null and b/public/resources/images/logos/license/MIT Logo.png differ
diff --git a/public/resources/images/logos/license/MIT Logo@2x.png b/public/resources/images/logos/license/MIT Logo@2x.png
new file mode 100644
index 0000000000..de4a2e84f6
Binary files /dev/null and b/public/resources/images/logos/license/MIT Logo@2x.png differ
diff --git a/public/resources/images/logos/license/MIT Logosvg .svg b/public/resources/images/logos/license/MIT Logosvg .svg
new file mode 100644
index 0000000000..79d9490656
--- /dev/null
+++ b/public/resources/images/logos/license/MIT Logosvg .svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file