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

Commit 65db6b9

Browse files
alexwolfenaomiblack
authored andcommitted
design(style): Restyle changes from Alex
1 parent c74c45f commit 65db6b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2134
-1343
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@
7777
"jstransformer-marked": "^1.0.1"
7878
},
7979
"homepage": "http://angular.io/"
80-
}
80+
}

public/_data.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"index": {
33
"hero": "home",
44
"title": "One framework.",
5-
"subtitle": "Mobile and desktop."
5+
"subtitle": "Mobile & desktop."
66
},
77

88
"features": {

public/_includes/_footer.jade

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ else
88
- var styleguide = "/docs/ts/latest/styleguide.html"
99

1010
.main-footer
11-
nav.background-blue-grey-900.grid-fluid
11+
nav.background-midnight.grid-fluid
1212

1313
.c3.main-footer-branding
1414
.logo-inverse-large
@@ -51,7 +51,7 @@ else
5151
ul.text-body
5252
li <a href="https://angular.cn/">中文版</a>
5353

54-
footer(class="background-steel")
54+
footer(class="background-midnight")
5555
small.text-caption Powered by Google ©2010-2016. Code licensed under an <a href="/license" class="text-snow">MIT-style License</a>. Documentation licensed under <a class="text-snow" href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
56-
a(aria-label="View Style Guide" href=styleguide title="Style Guide" class="styleguide-trigger text-snow" md-button)
56+
a(aria-label="View Style Guide" href=styleguide title="Style Guide" class="styleguide-trigger text-snow")
5757
span.icon-favorite

public/_includes/_hero-home.jade

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
header(class="background-sky")
2-
.hero.background-superhero-paper.is-large
3-
h1.text-headline.hero-logo #{title}<br>#{subtitle}
1+
header(class="background-sky l-relative")
42

5-
.hero-cta
6-
a(href="/docs/ts/latest/quickstart.html" class="md-raised button button-large button-plain" md-button) Get Started
3+
.hero.background-superhero-paper.is-large
4+
img(class="hero-logo" src='/resources/images/logos/angular2/angular.svg')
5+
h1.text-headline #{title}<br>#{subtitle}
6+
a(href="/docs/ts/latest/quickstart.html" class="hero-cta md-raised button button-large button-plain" md-button) Get Started
77

8-
.banner.banner-floaty
9-
.banner-ng-annoucement
10-
div(class="banner-text" align="center")
11-
p Join us for ng-europe in Paris, France this October!
12-
div(class="banner-button")
8+
.announcement-bar.shadow-2.clearfix
9+
img(src="/resources/images/logos/ng-europe/ng-europe-logo.png")
10+
p Join us for <strong>ng-europe in Paris</strong>, France this October!
1311
a(href="https://ngeurope.org/?utm_source=angular&utm_medium=banner&utm_campaign=angular-banner" target="_blank" class="button md-button") Register now
12+
13+
//- ANGULAR FINAL RELEASE ANNOUCEMENT
14+
//- .announcement-bar.shadow-2.clearfix
15+
//- img(src="/resources/images/logos/angular2/angular.svg")
16+
//- p Angular 2.0 Final Release Now Live!
17+
//- a(href="https://ngeurope.org/?utm_source=angular&utm_medium=banner&utm_campaign=angular-banner" target="_blank" class="button md-button") Learn More

public/_includes/_hero.jade

+22-25
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,27 @@
1313
if current.path[4] && current.path[3] == 'api'
1414
- var textFormat = 'is-standard-case'
1515

16-
header(class="hero background-sky", style=fixHeroCss ? "height:auto" : "")
17-
div(class="inner-header")
18-
h1(class="hero-title text-display-1 #{textFormat}") #{headerTitle}
19-
if useBadges
20-
span(class="badges")
21-
if docType
22-
span(class="status-badge").
23-
#{renamer(capitalize(docType))}
24-
if stability
25-
span(layout="row" class="status-badge")
26-
// badge circle is filled based on stability by matching a css selector in _hero.scss
27-
span(class="status-circle status-#{stability}")
28-
span Stability: #{capitalize(stability)}
29-
if security
30-
span(class="status-badge security-risk-badge").
31-
Security Risk
16+
header.hero.background-sky
17+
h1(class="hero-title #{textFormat}") #{headerTitle}
18+
19+
if useBadges
20+
if stability
21+
span(class="badge is-#{stability}").
22+
#{capitalize(stability)}
23+
if security
24+
span(class="badge is-deprecated").
25+
Security Risk
26+
27+
//CLEAR FLOAT ELEMENTS
28+
.clear
3229

3330
if subtitle
34-
h2.hero-subtitle.text-subhead #{subtitle}
35-
36-
else if current.path[3] == 'api' && current.path[1] == 'dart'
37-
block breadcrumbs
38-
//- Show cross-language menu for top-level API page (but not entry pages)
39-
if ! public.docs[current.path[1]][current.path[2]][current.path[3]][current.path[4]]
40-
!= partial("_version-dropdown")
41-
else if current.path[0] == "docs"
42-
!= partial("_version-dropdown")
31+
h2.hero-subtitle #{subtitle}
32+
33+
else if docType
34+
h2.hero-subtitle #{renamer(capitalize(docType))}
35+
36+
37+
if current.path[3] == 'api' && current.path[1] == 'dart'
38+
block breadcrumbs
39+

public/_includes/_main-nav.jade

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
- var language = current.path[1] || 'ts'
22
- if (language !== 'ts' || language !== 'js' || language !== 'dart') { language = 'ts'; }
33

4-
md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5",scroll-y-offset-element)
5-
nav
6-
h1 <a href="/" md-button>Angular <sup>by Google</sup></a>
4+
nav.main-nav.l-pinned-top.l-layer-5
5+
h1 <a href="/" md-button>Angular <sup>by Google</sup></a>
76

8-
button(class="main-nav-button main-nav-mobile-trigger l-right" aria-label="View Menu" ng-click="appCtrl.toggleMainMenu($event)" md-button) Site Menu <span class="icon icon-arrow-drop-down"></span>
7+
button(class="main-nav-button main-nav-mobile-trigger l-right" aria-label="View Menu" ng-click="appCtrl.toggleMainMenu($event)" md-button) Site Menu <span class="icon icon-arrow-drop-down"></span>
98

10-
ul(ng-class="appCtrl.showMainNav ? 'is-visible' : ''")
11-
li.l-left <a class="main-nav-button" href="/features.html" md-button>Features</a>
12-
li.l-left <a class="main-nav-button" href="/docs/#{language}/latest/" md-button>Docs</a>
13-
li.l-left <a class="main-nav-button" href="/events.html" md-button>Events</a>
14-
li.l-left <a class="main-nav-button" href="/news.html" md-button>News</a>
15-
li.l-right <a class="main-nav-button" href="/docs/ts/latest/quickstart.html" md-button>Get Started</a>
9+
ul(ng-class="appCtrl.showMainNav ? 'is-visible' : ''")
10+
li.l-left <a class="main-nav-button" href="/features.html" md-button>Features</a>
11+
li.l-left <a class="main-nav-button" href="/docs/#{language}/latest/" md-button>Docs</a>
12+
li.l-left <a class="main-nav-button" href="/events.html" md-button>Events</a>
13+
li.l-left <a class="main-nav-button" href="/news.html" md-button>News</a>
14+
li.l-right <a class="main-nav-button" href="/docs/ts/latest/quickstart.html" md-button>Get Started</a>

public/_includes/_util-fns.jade

+18-18
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ mixin makeExample(_filePath, region, _title, stylePatterns)
8383
- var format = attributes.format || defaultFormat;
8484
- if (attributes.format === '.') format = '';
8585
- var avoid = !!attributes.avoid;
86+
- var avoidClass = avoid ? 'is-anti-pattern' : '';
8687

87-
if (title)
88-
if (avoid)
89-
.example-title.avoid AVOID: #{title}
90-
else
91-
.example-title #{title}
92-
code-example(language="#{language}" format="#{format}")
93-
!= styleString(frag, stylePatterns)
88+
div(class="code-example #{avoidClass}")
89+
if (title)
90+
header
91+
h4 #{title}
92+
code-example(language="#{language}" format="#{format}")
93+
!= styleString(frag, stylePatterns)
9494

9595
//- Like makeExample, but: (1) doesn't show line numbers. (2) If region
9696
//- is omitted and title is 'foo (r)' then region is taken as 'r'.
@@ -142,17 +142,17 @@ mixin makeJson( filePath, jsonConfig, title, stylePatterns)
142142
- var json = unescapeHtml(frag);
143143
- var jsonExtract = extractJson(json, jsonConfig);
144144
- var avoid = !!attributes.avoid;
145-
146-
if (title)
147-
if (avoid)
148-
.example-title.avoid #{title}
149-
else
150-
.example-title #{title}
151-
code-example(language="#{language}" format="#{format}")
152-
if (jsonExtract == 'ERROR')
153-
err ERROR: Unable to extract json using config: "#{jsonConfig.toString()}"
154-
else
155-
!= styleString(jsonExtract, stylePatterns)
145+
- var avoidClass = avoid ? 'is-anti-pattern' : '';
146+
147+
div(class="code-example #{avoidClass}")
148+
if (title)
149+
header
150+
h4 #{title}
151+
code-example(language="#{language}" format="#{format}")
152+
if (jsonExtract == 'ERROR')
153+
err ERROR: Unable to extract json using config: "#{jsonConfig.toString()}"
154+
else
155+
!= styleString(jsonExtract, stylePatterns)
156156

157157
if !jade2ng
158158
//- Open (and close) an explanation <div>. See QuickStart

public/_includes/_version-dropdown.jade

+5-6
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ else if current.path[3]
3535

3636
//- VERSION TREE CREATOR MIXIN
3737
mixin tree(directory, urlPrefix, name, latest)
38-
ul
39-
for val, semvar in directory
40-
if semvar !== '.git' && semvar !== '_data'
41-
- var libVersion = (semvar == "latest") ? latest : semvar.replace(/\_+/gm, ".")
42-
li <a href="#{urlPrefix}/#{semvar}/#{page}" md-button>#{name} #{libVersion}</a>
38+
for val, semvar in directory
39+
if semvar !== '.git' && semvar !== '_data'
40+
- var libVersion = (semvar == "latest") ? latest : semvar.replace(/\_+/gm, ".")
41+
li <a href="#{urlPrefix}/#{semvar}/#{page}" md-button>#{name} #{libVersion}</a>
4342

4443

4544
//- BUTTON TITLE GENERATION
@@ -69,7 +68,7 @@ nav.dropdown
6968
div(class="overlay ng-hide" ng-click="appCtrl.toggleVersionMenu($event)" ng-show="appCtrl.showMenu")
7069

7170
<!-- DROPDOWN MENU -->
72-
div(class="dropdown-menu" ng-class="appCtrl.showMenu ? 'is-visible' : ''")
71+
ul(class="dropdown-menu" ng-class="appCtrl.showMenu ? 'is-visible' : ''")
7372
mixin tree(public.docs.ts, "/docs/ts", "Angular 2 for TypeScript")
7473
mixin tree(public.docs.js, "/docs/js", "Angular 2 for JavaScript")
7574
//- Disable cross-language link for API entry pages (but keep for top API search page):

public/docs/_includes/_side-nav.jade

+46-24
Original file line numberDiff line numberDiff line change
@@ -40,76 +40,98 @@
4040
- var reference = sections('', function(item) { return item.reference; });
4141
- var anyItemSelected = function(items) {
4242
- var selectedCount = items.filter(function(item) { return !!item.class; }).length;
43-
- return selectedCount > 0 ? 'is-nav-title-selected' : '';
43+
- return selectedCount > 0 ? 'is-selected' : '';
4444
- }
4545
- var isQuickstartSelected = function() {
4646
- var splitted = cur.split('/');
4747
- var bit = splitted[splitted.length - 1].replace('.html', '');
48-
- return bit === 'quickstart' ? 'is-nav-title-selected' : '';
48+
- return bit === 'quickstart' ? 'is-selected' : '';
4949
-}
5050
- var isApiReferenceSelected = function() {
5151
- var splitted = cur.split('/');
5252
- var bit = splitted[splitted.length - 2];
53-
- return bit === 'api' ? 'is-nav-title-selected' : '';
53+
- return bit === 'api' ? 'is-selected' : '';
5454
-}
5555
- var isCollapsed = function(titleStyle) {
56-
- return titleStyle === 'is-nav-title-selected' ? '' : 'is-hidden';
56+
- return titleStyle === 'is-selected' ? '' : 'is-hidden';
5757
- }
5858

59-
nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav
59+
- var language = current.path[1] || 'ts'
60+
- if (language !== 'ts' || language !== 'js' || language !== 'dart') { language = 'ts'; }
61+
62+
63+
nav(class="sidenav l-pinned-left l-layer-4 l-offset-nav" ng-class="appCtrl.showDocsNav ? 'is-visible' : ''")
6064
// SEARCH BAR
61-
header.side-nav-search.st-input-wrapper
65+
header.sidenav-search.st-input-wrapper
6266
form.st-input-inner
6367
label(for="search-io" class="is-hidden") Search Docs
6468
input(type="search" id="search-io" placeholder="SEARCH DOCS...")
6569
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>
6670

67-
div(class="side-nav-secondary" ng-class="appCtrl.showDocsNav ? 'is-visible' : ''")
68-
.nav-blocks
71+
ul(class="sidenav-links")
72+
li.sidenav-section.no-border
73+
a(class="nav-title" href="/docs/#{current.path[1]}/latest/") Docs Home
74+
75+
// CORE DOCUMENTATION
76+
li.sidenav-section-divider
77+
h3 Core Documentation
78+
79+
li.sidenav-section
6980
a(class="nav-title #{isQuickstartSelected(cur)}" href="#{qs.href}" title="#{qs.tooltip}") Quickstart
7081

71-
.nav-blocks
72-
a(class="nav-title #{anyItemSelected(tutorial)}" href="#{tutorial[0].href}" title="#{tutorial[0].tooltip}") Tutorial
73-
img(class="inline-arrow-down-svg" src="/resources/images/icons/ic_keyboard_arrow_down_black_24px.svg")
74-
.nav-ordered-lists(class="#{isCollapsed(anyItemSelected(tutorial))}")
75-
ul
76-
each item, index in tutorial
77-
li(class="nav-list-item #{item.class}"): a(href="#{item.href}" title="#{item.tooltip}") #{index + 1}. #{item.navTitle}
7882

79-
.nav-blocks
80-
a(class="nav-title #{anyItemSelected(basics)}" href="#{basics[0].href}" title="#{basics[0].tooltip}") Basics
83+
li.sidenav-section
84+
a(class="nav-title is-parent #{anyItemSelected(basics)}" href="#{basics[0].href}" title="#{basics[0].tooltip}") Guide
8185
img(class="inline-arrow-down-svg" src="/resources/images/icons/ic_keyboard_arrow_down_black_24px.svg")
8286

8387
.nav-ordered-lists(class="#{isCollapsed(anyItemSelected(basics))}")
8488
ul
8589
each item, index in basics
8690
li(class="nav-list-item #{item.class}"): a(href="#{item.href}" title="#{item.tooltip}") #{index + 1}. #{item.navTitle}
91+
li.sidenav-section.no-border
92+
a(class="nav-title #{isApiReferenceSelected()}" href="#{reference[0].href}" title="#{reference[0].tooltip}") API Reference
93+
94+
// ADVANCED DOCUMENATION
95+
li.sidenav-section-divider
96+
h3 Additional Documentation
97+
98+
li.sidenav-section
99+
a(class="nav-title is-parent #{anyItemSelected(tutorial)}" href="#{tutorial[0].href}" title="#{tutorial[0].tooltip}") Tutorial
100+
img(class="inline-arrow-down-svg" src="/resources/images/icons/ic_keyboard_arrow_down_black_24px.svg")
101+
.nav-ordered-lists(class="#{isCollapsed(anyItemSelected(tutorial))}")
102+
ul
103+
each item, index in tutorial
104+
li(class="nav-list-item #{item.class}"): a(href="#{item.href}" title="#{item.tooltip}") #{index + 1}. #{item.navTitle}
87105

88-
.nav-blocks
89-
a(class="nav-title #{anyItemSelected(guide)}" href="#{guide[0].href}" title="#{guide[0].tooltip}") Developer Guide
106+
li.sidenav-section
107+
a(class="nav-title is-parent #{anyItemSelected(guide)}" href="#{guide[0].href}" title="#{guide[0].tooltip}") Advanced Documentation
90108
img(class="inline-arrow-down-svg" src="/resources/images/icons/ic_keyboard_arrow_down_black_24px.svg")
91109

92110
.nav-unordered-lists(class="#{isCollapsed(anyItemSelected(guide))}")
93111
ul
94112
each item in guide
95113
li(class="nav-list-item #{item.class}"): a(href="#{item.href}" title="#{item.tooltip}") #{item.navTitle}
96114

97-
.nav-blocks
98-
a(class="nav-title #{anyItemSelected(cookbook)}" href="#{cookbook[0].href}" title="#{cookbook[0].tooltip}") Cookbook
115+
li.sidenav-section
116+
a(class="nav-title is-parent #{anyItemSelected(cookbook)}" href="#{cookbook[0].href}" title="#{cookbook[0].tooltip}") Cookbook
99117
img(class="inline-arrow-down-svg" src="/resources/images/icons/ic_keyboard_arrow_down_black_24px.svg")
100118

101119
.nav-unordered-lists(class="#{isCollapsed(anyItemSelected(cookbook))}")
102120
ul
103121
each item in cookbook
104122
li(class="nav-list-item #{item.class}"): a(href="#{item.href}" title="#{item.tooltip}") #{item.navTitle}
105123

106-
.nav-blocks
107-
a(class="nav-title #{isApiReferenceSelected()}" href="#{reference[0].href}" title="#{reference[0].tooltip}") API Reference
124+
125+
126+
127+
if current.path[0] == "docs"
128+
!= partial("../../_includes/_version-dropdown")
129+
108130

109131
script.
110132
// Could put in appCtrl but only needed here and clear here
111133
(function scrollToSelectedLink() {
112-
var sideNav = document.getElementsByClassName('side-nav')[0];
134+
var sideNav = document.getElementsByClassName('sidenav')[0];
113135
var link = sideNav.getElementsByClassName('is-selected')[0];
114136
if(link && link.offsetTop > window.innerHeight){
115137
sideNav.scrollTop = link.offsetTop - (window.innerHeight/2);

public/docs/_layout.jade

+3-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@ html(lang="en" ng-app="angularIOApp" itemscope itemtype="http://schema.org/Frame
2929
!= yield
3030
else
3131
article(class="l-content-small grid-fluid docs-content")
32-
div(class="c10")
33-
.showcase
34-
.showcase-content
35-
!= yield
36-
if (current.path[3] == 'guide' || current.path[3] == 'tutorial') && current.path[4]
37-
!= partial("../_includes/_next-item")
32+
!= yield
33+
if (current.path[3] == 'guide' || current.path[3] == 'tutorial') && current.path[4]
34+
!= partial("../_includes/_next-item")
3835

3936
!= partial("../_includes/_footer")
4037
!= partial("../_includes/_scripts-include")

public/docs/dart/latest/_data.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"index": {
33
"icon": "home",
44
"title": "Angular Docs",
5+
"subtitle": "Dart",
56
"menuTitle": "Docs Home",
6-
"banner": "Welcome to <b>angular.io/dart</b>! The current Angular 2 Dart release is <b>beta.21</b>. Consult the <a href='https://github.com/dart-lang/angular2/blob/master/CHANGELOG.md' target='_blank'>Change Log</a> about recent enhancements, fixes, and breaking changes."
7+
"banner": "Current release is <strong>beta.21</strong>. Consult the <a href='https://github.com/dart-lang/angular2/blob/master/CHANGELOG.md' target='_blank'>Change Log</a> about recent enhancements, fixes, and breaking changes."
78
},
89

910
"quickstart": {

0 commit comments

Comments
 (0)