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

Commit d8fcd5e

Browse files
Eric Jimeneznaomiblack
authored andcommitted
feat(nav reorg): reorganize footer and top nav
1 parent ff985c7 commit d8fcd5e

File tree

6 files changed

+35
-23
lines changed

6 files changed

+35
-23
lines changed

public/_includes/_footer.jade

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@ else
88
- var styleguide = "/docs/ts/latest/styleguide.html"
99

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

1313
.c3.main-footer-branding
1414
.logo-inverse-large
1515

1616
.c2
17-
h3.text-headline LIBRARIES
17+
h3.text-headline RESOURCES
1818

1919
ul.text-body
20-
li <a href="/"> Angular 2.0</a>
20+
li <a href="/presskit.html">Press Kit</a>
21+
// TODO: (ericjim) make a libraries page to showcase all angular 2 libraries
22+
//li <a href="/libraries.html">Libraries</a>
2123
li <a href="https://angularjs.org/"> Angular 1 for JS</a>
2224
li <a href="https://material.angularjs.org"> Angular Material</a>
2325
li <a href="https://www.firebase.com/docs/web/libraries/angular/"> AngularFire</a>
@@ -26,25 +28,26 @@ else
2628
h3.text-headline LEARN
2729

2830
ul.text-body
29-
li <a href="/docs/ts/latest/quickstart.html"> 5 Min Quickstart</a>
30-
li <a href="/docs/ts/latest/guide/"> Step by Step Guide</a>
31-
li <a href="/docs/ts/latest/api/"> Full API</a>
32-
li <a href="/docs/ts/latest/resources.html"> Resources</a>
33-
li <a href="http://goo.gl/sj0Nk1">Design Docs &amp; Notes</a>
31+
li <a href="/docs/ts/latest/api/">Docs</a>
32+
li <a href="/docs/ts/latest/guide/">Basics</a>
33+
li <a href="/docs/ts/latest/resources.html">Videos and Posts</a>
34+
//li <a href="http://goo.gl/sj0Nk1">Design Docs &amp; Notes</a>
3435
3536
.c2
3637
h3.text-headline HELP
3738

3839
ul.text-body
39-
li <a href="https://groups.google.com/forum/#!forum/angular"> Google Group</a>
40-
li <a href="https://gitter.im/angular/angular"> Chat Room</a>
41-
li <a href="https://github.com/angular/angular/issues"> Report an Issue</a>
40+
li <a class="main-nav-button" href="/contribute.html"> Contribute</a>
41+
li <a href="/support.html">Support Page</a>
42+
li <a href="https://github.com/angular/angular/issues"> File a Ticket</a>
43+
li <a ng-click="appCtrl.openFeedback()" aria-label="Submit feedback on this page"> Product Feedback</a>
4244

4345
.c3
4446
h3.text-headline COMMUNITY
4547

4648
ul.text-body
47-
li <a href="https://blog.angularjs.org/"> Blog</a>
49+
li <a href="/events.html"> Events & Meetups</a>
50+
li <a href="https://groups.google.com/forum/#!forum/angular"> Google Group</a>
4851
li <a href="https://plus.sandbox.google.com/+AngularJS/posts"> Google+</a>
4952
li <a href="https://twitter.com/angularjs"> Twitter</a>
5053
li <a href="https://github.com/angular/angular"> GitHub</a>

public/_includes/_hero-home.jade

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ header(class="background-sky")
33
h1.text-headline.hero-logo #{title}<br>#{subtitle}
44

55
.hero-cta
6-
a(href="/docs/ts/latest/quickstart.html" class="md-raised button button-large button-plain"
7-
md-button) Get Started
6+
a(href="/docs/ts/latest/quickstart.html" class="md-raised button button-large button-plain" md-button) Get Started
87

98
.banner.is-centered
109
.banner-ng-annoucement

public/_includes/_main-nav.jade

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5",scroll-y-off
1010
ul(ng-class="appCtrl.showMainNav ? 'is-visible' : ''")
1111
li.l-left <a class="main-nav-button" href="/features.html" md-button>Features</a>
1212
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="/about/" md-button>About</a>
14-
li.l-left <a class="main-nav-button" href="/contribute.html" md-button>Contribute</a>
15-
li.l-left <a class="main-nav-button" href="/support.html" md-button>Support</a>
16-
li.l-left <a class="main-nav-button" href="/news.html" md-button>News</a>
1713
li.l-left <a class="main-nav-button" href="/events.html" md-button>Events</a>
18-
li.l-right.feedback-button <md-button ng-click="appCtrl.openFeedback()" class="md-icon-button top-nav-icon" aria-label="Submit feedback on this page"><span class="material-icons">feedback</span></md-button>
14+
li.l-left <a class="main-nav-button" href="/news.html" md-button>Blog</a>
15+
li.l-left <a class="main-nav-button" href="/about/" md-button>About</a>
16+
li.l-right <a class="main-nav-button" href="/docs/ts/latest/quickstart.html" md-button>Get Started</a>

public/resources/css/_theme.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
color: $snow;
3131
}
3232

33+
.background-blue-grey-900 {
34+
background: #263238;
35+
color: $snow;
36+
}
3337

3438
/*
3539
* Background Images

public/resources/css/module/_footer.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
.main-footer {
1111
nav {
12+
h3 {
13+
font-size: 21px;
14+
}
15+
1216
padding: $unit * 6;
1317

1418
@media handheld and (max-width: $phone-breakpoint),
@@ -63,7 +67,6 @@
6367
display: block;
6468
text-decoration: none;
6569
padding: 0px ($unit * 2);
66-
background: $steel;
6770
margin-bottom: $unit;
6871
border-radius: 3px;
6972
line-height: $unit * 5;

public/resources/css/module/_main-nav.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
.main-nav-button {
5757
@media handheld and (max-width: $phone-breakpoint),
5858
screen and (max-device-width: $phone-breakpoint),
59-
screen and (max-width: $tablet-breakpoint) {
59+
screen and (max-width: $tablet-breakpoint),
60+
screen and (max-width: 960px) {
6061
display: block;
6162
float: none;
6263
line-height: $unit * 6;
@@ -75,9 +76,11 @@
7576
}
7677
}
7778

79+
// Make main nav icons disappear in favor of site map menu
7880
@media handheld and (max-width: $phone-breakpoint),
7981
screen and (max-device-width: $phone-breakpoint),
80-
screen and (max-width: $tablet-breakpoint) {
82+
screen and (max-width: $tablet-breakpoint),
83+
screen and (max-width: 960px) {
8184
box-shadow: 0px 2px 5px rgba(0, 0, 0, .3);
8285
float: none;
8386
position: absolute;
@@ -146,9 +149,11 @@
146149
opacity: .56;
147150
}
148151

152+
// Show sitemap menu
149153
@media handheld and (max-width: $phone-breakpoint),
150154
screen and (max-device-width: $phone-breakpoint),
151-
screen and (max-width: $tablet-breakpoint) {
155+
screen and (max-width: $tablet-breakpoint),
156+
screen and (max-width: 960px) {
152157
display: inline-block;
153158
}
154159
}

0 commit comments

Comments
 (0)