Skip to content

Commit f5ec161

Browse files
sivakumar-kailasamsivakumar-kailasam
authored
Merge pull request #565 from toddjordan/use-ember-styleguide-navbar
Use styleguide navbar to make consistent with the rest of the site
2 parents 7d0f128 + 56a28cf commit f5ec161

File tree

8 files changed

+1642
-336
lines changed

8 files changed

+1642
-336
lines changed

‎app/controllers/application.js

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
import Controller from '@ember/controller';
2+
3+
const links = [{
4+
name: 'Docs',
5+
type: 'dropdown',
6+
items: [{
7+
href: 'https://guides.emberjs.com',
8+
name: 'Guides',
9+
type: 'link'
10+
}, {
11+
href: 'https://emberjs.com/api',
12+
name: 'API Reference',
13+
type: 'link'
14+
}, {
15+
type: 'divider'
16+
}, {
17+
href: 'https://emberjs.com/learn',
18+
name: 'Learn Ember',
19+
type: 'link'
20+
}]
21+
}, {
22+
name: 'Releases',
23+
type: 'dropdown',
24+
items: [{
25+
href: 'https://emberjs.com/builds',
26+
name: 'Channels',
27+
type: 'link'
28+
}, {
29+
href: 'https://emberjs.com/builds/release',
30+
name: '-- Stable',
31+
type: 'link'
32+
}, {
33+
href: 'https://emberjs.com/builds/beta',
34+
name: '-- Beta',
35+
type: 'link'
36+
}, {
37+
href: 'https://emberjs.com/builds/canary',
38+
name: '-- Canary',
39+
type: 'link'
40+
}, {
41+
type: 'divider'
42+
}, {
43+
href: 'https://emberjs.com/deprecations',
44+
name: 'Deprecations',
45+
type: 'link'
46+
}, {
47+
href: 'https://emberjs.com/statusboard',
48+
name: 'Status Board',
49+
type: 'link'
50+
}]
51+
}, {
52+
href: 'https://emberjs.com/blog',
53+
name: 'Blog',
54+
type: 'link'
55+
}, {
56+
name: 'Community',
57+
type: 'dropdown',
58+
items: [{
59+
href: 'https://emberjs.com/community',
60+
name: 'The Ember Community',
61+
type: 'link'
62+
}, {
63+
href: 'https://emberjs.com/guidelines',
64+
name: 'Guidelines',
65+
type: 'link'
66+
}, {
67+
href: 'http://github.com/emberjs/',
68+
name: 'Contribute (Github)',
69+
type: 'link'
70+
}, {
71+
type: 'divider'
72+
}, {
73+
href: 'https://emberjs.com/community/meetups',
74+
name: 'Meetups',
75+
type: 'link'
76+
}, {
77+
href: 'http://jobs.emberjs.com/',
78+
name: 'Job Board',
79+
type: 'link'
80+
}, {
81+
type: 'divider'
82+
}, {
83+
href: 'http://emberconf.com/',
84+
name: 'Ember Conf',
85+
type: 'link'
86+
}]
87+
}, {
88+
name: 'About',
89+
type: 'dropdown',
90+
items: [{
91+
href: 'https://emberjs.com/team',
92+
name: 'The Team',
93+
type: 'link'
94+
}, {
95+
type: 'divider'
96+
}, {
97+
href: 'https://emberjs.com/logos',
98+
name: 'Logos',
99+
type: 'link'
100+
}, {
101+
href: 'https://emberjs.com/mascots',
102+
name: 'Mascots',
103+
type: 'link'
104+
}, {
105+
type: 'divider'
106+
}, {
107+
href: 'https://emberjs.com/ember-users',
108+
name: 'Who Uses Ember',
109+
type: 'link'
110+
}, {
111+
href: 'https://emberjs.com/sponsors',
112+
name: 'Sponsors',
113+
type: 'link'
114+
}, {
115+
type: 'divider'
116+
}, {
117+
href: 'https://emberjs.com/legal',
118+
name: 'Legal',
119+
type: 'link'
120+
}, {
121+
href: 'https://emberjs.com/security',
122+
name: 'Security',
123+
type: 'link'
124+
}]
125+
}];
126+
127+
export default Controller.extend({
128+
links: null,
129+
130+
init() {
131+
this._super(...arguments);
132+
this.links = links;
133+
}
134+
});

‎app/styles/_class.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
article.chapter {
22
h1.module-name {
3-
display: inline-block;
3+
display: inline;
44
}
55

66
.heading__link__edit {

‎app/styles/app.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ body {
2929
margin-bottom: 0;
3030
overflow:auto;
3131
padding: $base-spacing;
32-
32+
min-width: auto;
3333
&::after {
3434
clear: both;
3535
display: table;
@@ -40,7 +40,6 @@ body {
4040
main.container .content .chapter {
4141
width: 800px;
4242
max-width: 100%;
43-
margin: 0 auto;
4443
}
4544
}
4645

‎app/styles/components/_header.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ $white: white;
3838
font-family: 'Source Sans Pro';
3939
}
4040

41+
.es-header {
42+
font-family: "Roboto", "Helvetica Neue", "Helvetica", sans-serif;
43+
font-size: 18px;
44+
font-weight: 400;
45+
}
46+
4147
.header .container {
4248
display: flex;
4349
display: -webkit-flex;

‎app/templates/application.hbs

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
1-
<header class="header responsive">
2-
<nav role="navigation" aria-label="main">
3-
<ul class="header-nav container">
4-
<li class="header-logo">
5-
<a href="http://emberjs.com/"><span class="visually-hidden">Ember homepage</span></a>
6-
</li>
7-
<li><a href="/learn">Learn</a></li>
8-
<li><a href="http://guides.emberjs.com">Guides</a></li>
9-
<li class="api-docs">{{link-to 'API' 'index'}}</li>
10-
<li><a href="/community">Community</a></li>
11-
<li><a href="/blog">Blog</a></li>
12-
<li><a href="/builds">Builds</a></li>
13-
<li class="header-search">
14-
{{search-input}}
15-
</li>
16-
</ul>
17-
</nav>
18-
</header>
19-
1+
{{#es-header}}
2+
{{#es-navbar links=links}}
3+
{{search-input}}
4+
{{/es-navbar}}
5+
{{/es-header}}
206
<main class="container">
217
{{outlet}}
228
</main>

‎package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"ember-cli-inject-live-reload": "^1.7.0",
5959
"ember-cli-meta-tags": "^5.0.0",
6060
"ember-cli-qunit": "^4.3.0",
61-
"ember-cli-sass": "^7.0.0",
61+
"ember-cli-sass": "^8.0.1",
6262
"ember-cli-shims": "^1.1.0",
6363
"ember-cli-template-lint": "^0.7.1",
6464
"ember-cli-uglify": "^1.2.0",
@@ -80,7 +80,8 @@
8080
"ember-resolver": "^4.3.0",
8181
"ember-route-action-helper": "^2.0.5",
8282
"ember-source": "^2.14.1",
83-
"ember-svg-jar": "^0.11.1",
83+
"ember-styleguide": "^2.3.1",
84+
"ember-svg-jar": "^1.2.2",
8485
"ember-test-selectors": "^0.3.6",
8586
"ember-tether": "1.0.0-beta.0",
8687
"ember-truth-helpers": "^1.3.0",
@@ -91,6 +92,7 @@
9192
"minimist": "^1.2.0",
9293
"normalize.css": "^7.0.0",
9394
"qunit-dom": "^0.3.2",
95+
"sass": "^1.14.3",
9496
"spawndamnit": "2.0.0"
9597
},
9698
"engines": {

‎public/assets/images/ember-logo-1c-white.svg

Lines changed: 15 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)