8000 Merge pull request #129 from WonSong/master · rusongyu/angular.io@d8fcbaa · GitHub
[go: up one dir, main page]
Skip to content

Commit d8fcbaa

Browse files
author
Alex Wolfe
committed
Merge pull request angular#129 from WonSong/master
angular#128: 5 Min Quickstart small issue fix & angular#119: Download page formatting
2 parents 88ead0d + 93bc37f commit d8fcbaa

File tree

6 files changed

+19
-24
lines changed

6 files changed

+19
-24
lines changed

‎public/_includes/_main-nav.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5")
99
li.l-left <a class="main-nav-button" href="/docs/js/latest/" md-button>Docs</a>
1010
li.l-left <a class="main-nav-button" href="/about/" md-button>About</a>
1111
li.l-left <a class="main-nav-button" href="/contribute.html" md-button>Contribute</a>
12-
li.l-right <a class="main-nav-button has-icon" href="/download/" md-button> <span class="icon icon-cloud-download"></span> Download</a>
12+
li.l-right <a class="main-nav-button has-icon" href="/download/" md-button> <span class="icon icon-cloud-download"></span> Install</a>

‎public/docs/js/latest/quickstart.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
p Inside of <code>app.ts</code>, import the type definitions from Angular:
5757
code-example.
58-
&lt;reference path="typings/angular2/angular2.d.ts" &gt;
58+
/// &lt;reference path="typings/angular2/angular2.d.ts" /&gt;
5959

6060
p Now your editor should be able to complete the available imports:
6161
code-example.

‎public/download/_data.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,32 @@
1414
}
1515
},
1616

17-
18-
19-
"Angular_1.X": {
17+
"Angular_1": {
2018
"description": "The production ready version of Angular for JavaScript",
2119

22-
"1.X": {
20+
"1": {
2321
"file": "https://code.angularjs.org/"
2422
}
2523
},
2624

27-
"AngularDart_1.X": {
25+
"AngularDart_1": {
2826
"description": "The production ready version of Angular for Dart",
2927

30-
"1.X": {
28+
"1": {
3129
"file": "https://angulardart.org/"
3230
}
3331
},
3432

35-
"AngularFire_1.X": {
33+
"AngularFire_1": {
3634
"description": "AngularFire is the officially supported Angular binding for Firebase.",
37-
"1.X": {
35+
"1": {
3836
"file": "https://www.firebase.com/docs/web/libraries/angular/index.html"
3937
}
4038
},
4139

42-
"AngularMaterial_1.X": {
40+
"AngularMaterial_1": {
4341
"description": "The Angular Material project is an implementation of Material Design in Angular 1 for JS.",
44-
"1.X": {
42+
"1": {
4543
"file": "https://material.angularjs.org/#/getting-started"
4644
}
4745
}

‎public/download/index.jade

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.grid-fluid.l-space-bottom-8
22
for versions, framework in downloads
3-
div.c9.card
3+
div.c9.l-space-bottom-4
44
frameworkName = framework.replace(/\_/gm, ' ')
55
header
66
h2.text-headline #{frameworkName}
@@ -11,16 +11,15 @@
1111
p #{version}
1212

1313
else
14-
.card-content
15-
h3.text-body Version #{name}
16-
17-
ul
14+
ul.l-pad-left-0
1815
if version.file
19-
li <a href="#{version.file}"> Download for #{name}</a>
16+
li
17+
!= partial("../_includes/_hover-card", {name: "Version " + name, url: version.file })
2018

2119
if version.npm
22-
li <a href="#{version.npm}"> NPM installation for #{name}</a>
20+
li
21+
!= partial("../_includes/_hover-card", {name: "Version " + name, url: version.npm })
2322

2423
if version.pub
25-
li <a href="#{version.pub}"> Pub installation for #{name}</a>
26-
24+
li
25+
!= partial("../_includes/_hover-card", {name: "Version " + name, url: version.pub })

‎public/resources/css/layout/_layout.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
*
143143
*/
144144

145-
@for $i from 1 through 10 {
145+
@for $i from 0 through 10 {
146146
.l-space-#{$i} {
147147
margin: $i * 8px;
148148
}

‎public/resources/css/module/_card.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
border-bottom: none;
2727
}
2828

29-
30-
3129
h3 {
3230
margin: 0px;
3331
}

0 commit comments

Comments
 (0)
0