From 8300295fa2d3b11399d78b587d9a94546a1353a1 Mon Sep 17 00:00:00 2001 From: Won Song Date: Tue, 19 May 2015 21:58:27 -0700 Subject: [PATCH 1/3] #128 Added /// and enclosing slash --- public/docs/js/latest/quickstart.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/js/latest/quickstart.jade b/public/docs/js/latest/quickstart.jade index 495572c5cf..f7e0a61719 100644 --- a/public/docs/js/latest/quickstart.jade +++ b/public/docs/js/latest/quickstart.jade @@ -55,7 +55,7 @@ p Inside of app.ts, import the type definitions from Angular: code-example. - <reference path="typings/angular2/angular2.d.ts" > + /// <reference path="typings/angular2/angular2.d.ts" /> p Now your editor should be able to complete the available imports: code-example. From dc1bafd46d450d0829ddcf2c2dd2b49b93440071 Mon Sep 17 00:00:00 2001 From: Won Song Date: Tue, 19 May 2015 22:37:45 -0700 Subject: [PATCH 2/3] #119 1. Removed X from 1.x titles 2. Replaced links with hover cards 3. Changed Download to Install --- public/_includes/_main-nav.jade | 2 +- public/download/_data.json | 18 ++++++++---------- public/download/index.jade | 13 +++++++------ public/resources/css/module/_card.scss | 25 ++++++++++++++++--------- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade index 8f7fe1e9b3..3f5a66386c 100644 --- a/public/_includes/_main-nav.jade +++ b/public/_includes/_main-nav.jade @@ -9,4 +9,4 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5") li.l-left Docs li.l-left About li.l-left Contribute - li.l-right Download \ No newline at end of file + li.l-right Install \ No newline at end of file diff --git a/public/download/_data.json b/public/download/_data.json index 35e900d502..4e32379336 100644 --- a/public/download/_data.json +++ b/public/download/_data.json @@ -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" } } diff --git a/public/download/index.jade b/public/download/index.jade index 7009223790..55f09f6bdc 100644 --- a/public/download/index.jade +++ b/public/download/index.jade @@ -12,15 +12,16 @@ else .card-content - h3.text-body Version #{name} - ul + ul.hover-card-container if version.file - li Download for #{name} + li + != partial("../_includes/_hover-card", {name: "Version " + name, url: version.file }) if version.npm - li NPM installation for #{name} + li + != partial("../_includes/_hover-card", {name: "Version " + name, url: version.npm }) if version.pub - li Pub installation for #{name} - + li + != partial("../_includes/_hover-card", {name: "Version " + name, url: version.pub }) diff --git a/public/resources/css/module/_card.scss b/public/resources/css/module/_card.scss index 5a90d549cf..cbd7c859fb 100644 --- a/public/resources/css/module/_card.scss +++ b/public/resources/css/module/_card.scss @@ -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; + &: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 { + text-decoration: underline; + background: $mist; + } } } + + &.hover-card-container { + margin-left: 0; + margin-top: $unit * 2; + } } } From 93bc37f597a8ac2cd55f0866d0da29f0bb305caa Mon Sep 17 00:00:00 2001 From: Won Song Date: Tue, 19 May 2015 23:17:03 -0700 Subject: [PATCH 3/3] #119 1. Changed the download page layout per feedback. 2. Removed custom styles added. 3. 0 to layout loop.... because I couldn't find a better way to remove padding left on UL :( --- public/download/index.jade | 6 ++---- public/resources/css/layout/_layout.scss | 2 +- public/resources/css/module/_card.scss | 27 ++++++++---------------- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/public/download/index.jade b/public/download/index.jade index 55f09f6bdc..bb867449fa 100644 --- a/public/download/index.jade +++ b/public/download/index.jade @@ -1,6 +1,6 @@ .grid-fluid.l-space-bottom-8 for versions, framework in downloads - div.c9.card + div.c9.l-space-bottom-4 frameworkName = framework.replace(/\_/gm, ' ') header h2.text-headline #{frameworkName} @@ -11,9 +11,7 @@ p #{version} else - .card-content - - ul.hover-card-container + ul.l-pad-left-0 if version.file li != partial("../_includes/_hover-card", {name: "Version " + name, url: version.file }) diff --git a/public/resources/css/layout/_layout.scss b/public/resources/css/layout/_layout.scss index 02aaa4c104..8387871a1a 100644 --- a/public/resources/css/layout/_layout.scss +++ b/public/resources/css/layout/_layout.scss @@ -142,7 +142,7 @@ * */ -@for $i from 1 through 10 { +@for $i from 0 through 10 { .l-space-#{$i} { margin: $i * 8px; } diff --git a/public/resources/css/module/_card.scss b/public/resources/css/module/_card.scss index cbd7c859fb..05844f4138 100644 --- a/public/resources/css/module/_card.scss +++ b/public/resources/css/module/_card.scss @@ -26,8 +26,6 @@ border-bottom: none; } - - h3 { margin: 0px; } @@ -36,25 +34,18 @@ padding: 0px; margin: 0px 0px 0px ($unit * 4); - &:not(.hover-card-container) { - a { - font-size: 14px; - display: block; - line-height: 24px; - text-decoration: none; - padding: 0px 4px; + a { + font-size: 14px; + display: block; + line-height: 24px; + text-decoration: none; + padding: 0px 4px; - &:hover { - text-decoration: underline; - background: $mist; - } + &:hover { + text-decoration: underline; + background: $mist; } } - - &.hover-card-container { - margin-left: 0; - margin-top: $unit * 2; - } } }