8000 #128: 5 Min Quickstart small issue fix & #119: Download page formatting by WonSong · Pull Request #129 · angular/angular.io · GitHub
[go: up one dir, main page]

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

#128: 5 Min Quickstart small issue fix & #119: Download page formatting #129

Merged
merged 3 commits into from
May 20, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
1. Removed X from 1.x titles
2. Replaced links with hover cards
3. Changed Download to Install
  • Loading branch information
Won Song committed May 20, 2015
commit dc1bafd46d450d0829ddcf2c2dd2b49b93440071
2 changes: 1 addition & 1 deletion public/_includes/_main-nav.jade
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5")
li.l-left <a class="main-nav-button" href="/docs/js/latest/" md-button>Docs</a>
li.l-left <a class="main-nav-button" href="/about/" md-button>About</a>
li.l-left <a class="main-nav-button" href="/contribute.html" md-button>Contribute</a>
li.l-right <a class="main-nav-button has-icon" href="/download/" md-button> <span class="icon icon-cloud-download"></span> Download</a>
li.l-right <a class="main-nav-button has-icon" href="/download/" md-button> <span class="icon icon-cloud-download"></span> Install</a>
18 changes: 8 additions & 10 deletions public/download/_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,32 @@
}
},



"Angular_1.X": {
"Angular_1": {
"description": "The production ready version of Angular for JavaScript",

"1.X": {
"1": {
"file": "https://code.angularjs.org/"
}
},

"AngularDart_1.X": {
"AngularDart_1": {
"description": "The production ready version of Angular for Dart",

"1.X": {
"1": {
"file": "https://angulardart.org/"
}
},

"AngularFire_1.X": {
"AngularFire_1": {
"description": "AngularFire is the officially supported Angular binding for Firebase.",
"1.X": {
"1": {
"file": "https://www.firebase.com/docs/web/libraries/angular/index.html"
}
},

"AngularMaterial_1.X": {
"AngularMaterial_1": {
"description": "The Angular Material project is an implementation of Material Design in Angular 1 for JS.",
"1.X": {
"1": {
"file": "https://material.angularjs.org/#/getting-started"
}
}
Expand Down
13 changes: 7 additions & 6 deletions public/download/index.jade
10000
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@

else
.card-content
h3.text-body Version #{name}

ul
ul.hover-card-container
if version.file
li <a href="#{version.file}"> Download for #{name}</a>
li
!= partial("../_includes/_hover-card", {name: "Version " + name, url: version.file })

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

if version.pub
li <a href="#{version.pub}"> Pub installation for #{name}</a>

li
!= partial("../_includes/_hover-card", {name: "Version " + name, url: version.pub })
27 changes: 17 additions & 10 deletions public/resources/css/module/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,25 @@
padding: 0px;
margin: 0px 0px 0px ($unit * 4);

a {
font-size: 14px;
display: block;
line-height: 24px;
text-decoration: none;
padding: 0px 4px;

&:hover {
text-decoration: underline;
background: $mist;
&:not(.hover-card-container) {
a {
font-size: 14px;
display: block;
line-height: 24px;
text-decoration: none;
padding: 0px 4px;

&:hover {
text-decoration: underline;
background: $mist;
}
}
}

&.hover-card-container {
margin-left: 0;
margin-top: $unit * 2;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should just replace the entire containers on the install page with the cards instead of putting them inside the card module. You should then be able to remove these extras styles. Thanks.

}
}

Expand Down
0