From d69eed18eeff598a3837d784b601fcd10b84be80 Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Tue, 21 Apr 2015 23:09:13 -0700 Subject: [PATCH] guide and api homepage update --- public/_includes/_docs-nav.jade | 2 +- public/_includes/_hover-card.jade | 12 ++-- public/_includes/_next-item.jade | 23 ++++---- public/docs/js/latest/_data.json | 6 +- public/docs/js/latest/api/_data.json | 4 ++ .../js/latest/{api.jade => api/index.jade} | 9 ++- public/docs/js/latest/guide/_data.json | 4 ++ .../latest/{guide.jade => guide/index.jade} | 4 +- public/docs/js/latest/index.jade | 4 +- public/resources/css/module/_hover-card.scss | 56 ++++--------------- 10 files changed, 50 insertions(+), 74 deletions(-) rename public/docs/js/latest/{api.jade => api/index.jade} (66%) rename public/docs/js/latest/{guide.jade => guide/index.jade} (58%) diff --git a/public/_includes/_docs-nav.jade b/public/_includes/_docs-nav.jade index 5246f85785..7b0444b98f 100644 --- a/public/_includes/_docs-nav.jade +++ b/public/_includes/_docs-nav.jade @@ -13,7 +13,7 @@ nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav // PRIMARY NAVIGATION - li(class="#{selected}") #{name} + li(class="#{selected}") #{name} // SECONDARY NAVIGATION diff --git a/public/_includes/_hover-card.jade b/public/_includes/_hover-card.jade index ea218a8c24..64d852f643 100644 --- a/public/_includes/_hover-card.jade +++ b/public/_includes/_hover-card.jade @@ -1,10 +1,10 @@ -a(class="hover-card is-button has-icon" href="#{url}" md-button) - span(class="hover-card-icon #{classes}") - if number - h3 #{number}. #{name} +hasIcon = icon ? 'has-icon' : '' +iconNumber = number ? number : '' +a(class="hover-card is-button #{hasIcon}" href="#{url}" md-button) + if icon + span(class="hover-card-icon #{icon}") #{iconNumber} - else - h3 #{name} + h3 #{name} if cta p #{cta} diff --git a/public/_includes/_next-item.jade b/public/_includes/_next-item.jade index 9b8119e5ba..8fd337e78a 100644 --- a/public/_includes/_next-item.jade +++ b/public/_includes/_next-item.jade @@ -4,18 +4,19 @@ data = public.docs[current.path[1]][current.path[2]][current.path[3]]._data for page, slug in data - // CHECK IF CURRENT PAGE IS SET, THEN SET NEXT PAGE - if currentPage - if !nextPage - .l-sub-section - h3 Next Step - a(href="/docs/#{current.path[1]}/#{current.path[2]}/#{current.path[3]}/#{slug}.html") #{page.title} + if slug != "index" + // CHECK IF CURRENT PAGE IS SET, THEN SET NEXT PAGE + if currentPage + if !nextPage + .l-sub-section + h3 Next Step + a(href="/docs/#{current.path[1]}/#{current.path[2]}/#{current.path[3]}/#{slug}.html") #{page.title} - //NEXT PAGE HAS NOW BEEN SET - nextPage = true + //NEXT PAGE HAS NOW BEEN SET + nextPage = true - // SET CURRENT PAGE FLAG WHEN YOU PASS IT - if current.path[4] == slug - currentPage = true + // SET CURRENT PAGE FLAG WHEN YOU PASS IT + if current.path[4] == slug + currentPage = true diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json index 471dc1e1f5..a6f4daf6c5 100644 --- a/public/docs/js/latest/_data.json +++ b/public/docs/js/latest/_data.json @@ -1,4 +1,6 @@ { + "strict": true, + "index": { "icon": "home", "title": "Angular Docs", @@ -19,7 +21,9 @@ "api": { "icon": "book", - "title": "API Preview" + "title": "API Preview", + "strict": true + }, "help": { diff --git a/public/docs/js/latest/api/_data.json b/public/docs/js/latest/api/_data.json index 62b0104ee9..d407d5458b 100644 --- a/public/docs/js/latest/api/_data.json +++ b/public/docs/js/latest/api/_data.json @@ -1,4 +1,8 @@ { + "index": { + "title": "API Preview" + }, + "annotations" : { "title" : "Annotations" }, diff --git a/public/docs/js/latest/api.jade b/public/docs/js/latest/api/index.jade similarity index 66% rename from public/docs/js/latest/api.jade rename to public/docs/js/latest/api/index.jade index c293164238..9b23b0e015 100644 --- a/public/docs/js/latest/api.jade +++ b/public/docs/js/latest/api/index.jade @@ -8,11 +8,10 @@ in the development community. If you're building a production app today, please use Angular 1.X. -number = 1; ul for page, slug in public.docs[current.path[1]][current.path[2]].api._data - url = "/docs/" + current.path[1] + "/" + current.path[2] + "/" + current.path[3] + "/" + slug + ".html" - num = number++ + if slug != 'index' + url = "/docs/" + current.path[1] + "/" + current.path[2] + "/" + current.path[3] + "/" + slug + ".html" - li.c8 - != partial("../../../_includes/_hover-card", { number: num, name: page.title, url: url }) + li.c8 + != partial("../../../../_includes/_hover-card", {name: page.title, url: url }) diff --git a/public/docs/js/latest/guide/_data.json b/public/docs/js/latest/guide/_data.json index 443462cdec..4960a1a245 100644 --- a/public/docs/js/latest/guide/_data.json +++ b/public/docs/js/latest/guide/_data.json @@ -1,6 +1,10 @@ { "_listtype": "ordered", + "index": { + "title": "Step By Step Guide" + }, + "setup": { "title": "Getting Started" }, diff --git a/public/docs/js/latest/guide.jade b/public/docs/js/latest/guide/index.jade similarity index 58% rename from public/docs/js/latest/guide.jade rename to public/docs/js/latest/guide/index.jade index eacee6b0d6..66aa7bf4dd 100644 --- a/public/docs/js/latest/guide.jade +++ b/public/docs/js/latest/guide/index.jade @@ -2,9 +2,9 @@ number = 1; ul for page, slug in public.docs[current.path[1]][current.path[2]].guide._data - if slug != '_listtype' + if slug != '_listtype' && slug != 'index' url = "/docs/" + current.path[1] + "/" + current.path[2] + "/" + current.path[3] + "/" + slug + ".html" num = number++ li.c8 - != partial("../../../_includes/_hover-card", { number: num, name: page.title, url: url }) + != partial("../../../../_includes/_hover-card", { icon: "icon-number", number: num, name: page.title, url: url }) diff --git a/public/docs/js/latest/index.jade b/public/docs/js/latest/index.jade index d5d690bb10..b6691e81fe 100644 --- a/public/docs/js/latest/index.jade +++ b/public/docs/js/latest/index.jade @@ -16,7 +16,7 @@ div.c4 p.text-body Step by Step Guide footer - a(href="/docs/#{current.path[1]}/#{current.path[2]}/guide.html" class="button button-primary" md-button) View Guide + a(href="/docs/#{current.path[1]}/#{current.path[2]}/guide/" class="button button-primary" md-button) View Guide div.c4 @@ -26,5 +26,5 @@ div.c4 p.text-body Proposal for v2.0 API footer - a(href="/docs/#{current.path[1]}/#{current.path[2]}/api.html" class="button" md-button) View API + a(href="/docs/#{current.path[1]}/#{current.path[2]}/api/" class="button" md-button) View API diff --git a/public/resources/css/module/_hover-card.scss b/public/resources/css/module/_hover-card.scss index d8fca9fc30..f309c14260 100644 --- a/public/resources/css/module/_hover-card.scss +++ b/public/resources/css/module/_hover-card.scss @@ -30,6 +30,7 @@ .hover-card-icon { color: rgba($blueberry, .87); + border-color: rgba($blueberry, .87); } h3 { @@ -64,54 +65,17 @@ color: rgba($cloud, .56); } - .icon-Java { + .icon-number { top: 16px; - left: 20px; - font-size: 40px; - } - - .icon-python { - top: 22px; - left: 20px; - font-size: 34px; - } - - .icon-Nodejs { - top: 20px; - left: 20px; - font-size: 38px; - } - - .icon-go { - background: url('/resources/images/icons/languages/go-icon-large.png') 0px 0px no-repeat; - height: 32px; - width: 24px; - left: 23px; - top: 21px; - } - - .icon-ruby { - background: url('/resources/images/icons/languages/ruby-icon-large.png') 0px 0px no-repeat; - height: 30px; - width: 30px; - left: 21px; - top: 22px; - } - - .icon-php { - top: 26px; - left: 14px; - font-size: 25px; - } - - .icon-C { - top: 26px; + left: $unit * 2; font-size: 24px; - } - - .icon-connection { - top: 24px; - font-size: 28px; + line-height: 36px; + height: 40px; + width: 40px; + text-align: center; + border: 2px solid $mist; + border-radius: 200px; + padding: 0px; }