Skip to content

Commit 4ed6555

Browse files
mansonamansona
authored
Merge pull request #833 from ember-learn/use-ember-styleguide
use latest ember-styleguide with website-redesign branch
2 parents 2a7bdcb + 1e49554 commit 4ed6555

File tree

14 files changed

+28166
-33309
lines changed

14 files changed

+28166
-33309
lines changed

‎app/components/ember-data-landing-page.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<h1>
33
Ember Data API Documentation
44
</h1>
5+
<hr>
56
<p>
67
Ember Data is a library for robustly managing data in applications built with Ember.js.
78
</p>

‎app/components/ember-landing-page.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<article class="chapter">
22
<h1>Ember API Documentation</h1>
3+
<hr>
34
<p>
45
To get started, choose a project (Ember or Ember Data) and a version
56
from the dropdown menu. Ember has core methods used in any app, while Ember Data has

‎app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{{content-for "head"}}
1111

1212
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13-
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-api-docs.css">
13+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/app.css">
1414
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600" rel="stylesheet">
1515

1616
{{content-for "head-footer"}}

‎app/templates/application.hbs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
<HeadLayout />
2+
13
<EsHeader>
2-
<EsNavbar @links={{this.links}}>
3-
<SearchInput />
4-
</EsNavbar>
4+
{{!-- <SearchInput /> --}}
55
</EsHeader>
6-
<main class="container">
6+
7+
<main>
78
{{outlet}}
89
</main>
9-
<EsFooter />
1010

11-
{{!-- required by ember-cli-meta-tags --}}
12-
<HeadLayout />
11+
<EsFooter />

‎app/templates/ember-cli.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<section class="content">
1919
<article class="chapter">
2020
<h1>Ember CLI API Documentation</h1>
21+
<hr>
2122
<p>Ember CLI API documentation is available on <a href="https://ember-cli.com/api">ember-cli.com/api</a>.</p>
2223
</article>
2324
</section>

‎app/templates/project-version.hbs

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
11
{{! template-lint-disable no-inline-styles }}
2-
<aside class="sidebar">
3-
<ol class="toc-level-0">
4-
<li class="toc-level-0" data-test-home>
5-
<LinkTo @route="project" @model="ember">Home</LinkTo>
6-
</li>
7-
<li class="toc-level-0">
8-
Projects
9-
<ol class="toc-level-1 selected" style="display: block;">
10-
<li class="toc-level-1"><LinkTo @route="project" @model="ember" @current-when={{eq this.activeProject "ember"}} class="spec-ember">Ember</LinkTo></li>
11-
<li class="toc-level-1"><LinkTo @route="project" @model="ember-data" @current-when={{eq this.activeProject "ember-data"}} class="spec-ember-data">Ember Data</LinkTo></li>
12-
<li class="toc-level-1"><LinkTo @route="project" @model="ember-cli" @current-when={{eq this.activeProject "ember-cli"}} class="spec-ember">Ember CLI</LinkTo></li>
13-
</ol>
14-
</li>
15-
</ol>
2+
<div class="sidebar-container">
3+
<EsSidebar>
4+
<ol class="toc-level-0">
5+
<li class="toc-level-0" data-test-home>
6+
<LinkTo @route="project" @model="ember">Home</LinkTo>
7+
</li>
8+
<li class="toc-level-0">
9+
Projects
10+
<ol class="toc-level-1 selected" style="display: block;">
11+
<li class="toc-level-1"><LinkTo @route="project" @model="ember" @current-when={{eq this.activeProject "ember"}} class="spec-ember">Ember</LinkTo></li>
12+
<li class="toc-level-1"><LinkTo @route="project" @model="ember-data" @current-when={{eq this.activeProject "ember-data"}} class="spec-ember-data">Ember Data</LinkTo></li>
13+
<li class="toc-level-1"><LinkTo @route="project" @model="ember-cli" @current-when={{eq this.activeProject "ember-cli"}} class="spec-ember">Ember CLI</LinkTo></li>
14+
</ol>
15+
</li>
16+
</ol>
1617

17-
<div class="select-container">
18-
<PowerSelect
19-
@onChange={{route-action "updateProject" this.activeProject}}
20-
@options={{this.projectVersions}}
21-
@selected={{this.selectedProjectVersion}}
22-
@ariaLabel="Select a version"
23-
@required={{true}}
24-
@searchField="compactVersion"
25-
@searchEnabled={{true}}
26-
as |ver|
27-
>
28-
{{ver.compactVersion}}
29-
</PowerSelect>
30-
</div>
18+
<div class="select-container">
19+
<PowerSelect
20+
@onChange={{route-action "updateProject" this.activeProject}}
21+
@options={{this.projectVersions}}
22+
@selected={{this.selectedProjectVersion}}
23+
@ariaLabel="Select a version"
24+
@required={{true}}
25+
@searchField="compactVersion"
26+
@searchEnabled={{true}}
27+
as |ver|
28+
>
29+
{{ver.compactVersion}}
30+
</PowerSelect>
31+
</div>
3132

32-
<TableOfContents
33-
@version={{this.urlVersion}}
34-
@classesIDs={{this.shownClassesIDs}}
35-
@moduleIDs={{this.shownModuleIDs}}
36-
@namespaceIDs={{this.shownNamespaceIDs}}
37-
@showPrivateClasses={{this.showPrivateClasses}}
38-
@togglePrivateClasses={{this.togglePrivateClasses}}
39-
@isShowingNamespaces={{version-lt this.selectedProjectVersion.compactVersion "2.16"}}
40-
/>
41-
</aside>
42-
<section class="content">
43-
{{outlet}}
44-
</section>
33+
<TableOfContents
34+
@version={{this.urlVersion}}
35+
@classesIDs={{this.shownClassesIDs}}
36+
@moduleIDs={{this.shownModuleIDs}}
37+
@namespaceIDs={{this.shownNamespaceIDs}}
38+
@showPrivateClasses={{this.showPrivateClasses}}
39+
@togglePrivateClasses={{this.togglePrivateClasses}}
40+
@isShowingNamespaces={{version-lt this.selectedProjectVersion.compactVersion "2.16"}}
41+
/>
42+
</EsSidebar>
43+
<section class="content">
44+
{{outlet}}
45+
</section>
46+
</div>

‎app/templates/project-version/classes/class.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{/if}}
66
<h1 class="module-name">Class {{@model.name}}</h1>
77
{{#if @model.access}}<span class="access">{{@model.access}}</span>{{/if}}
8-
8+
<hr>
99
<div class="attributes">
1010
{{#if @model.extends}}
1111
<div class="attribute">

‎app/templates/project-version/functions/function.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
<h1 class="module-name">Function</h1>
2+
<hr>
23
<ClassFieldDescription @type="method" @field={{@model.fn}} @model={{@model.fnModule}} />

‎app/templates/project-version/modules/module.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<h1 class="module-name">Package {{this.model.name}}</h1>
66
{{/if}}
77
{{#if this.model.access}}<span class="access">{{this.model.access}}</span>{{/if}}
8+
<hr>
89

910
<p class="attributes">
1011
{{#if this.model.parent}}

0 commit comments

Comments
 (0)