Skip to content

use latest ember-styleguide with website-redesign branch #833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions app/components/ember-data-landing-page.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<h1>
Ember Data API Documentation
</h1>
<hr>
<p>
Ember Data is a library for robustly managing data in applications built with Ember.js.
</p>
Expand Down
1 change: 1 addition & 0 deletions app/components/ember-landing-page.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<article class="chapter">
<h1>Ember API Documentation</h1>
<hr>
<p>
To get started, choose a project (Ember or Ember Data) and a version
from the dropdown menu. Ember has core methods used in any app, while Ember Data has
Expand Down
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{content-for "head"}}

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

{{content-for "head-footer"}}
Expand Down
13 changes: 6 additions & 7 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<HeadLayout />

<EsHeader>
<EsNavbar @links={{this.links}}>
<SearchInput />
</EsNavbar>
{{!-- <SearchInput /> --}}
</EsHeader>
<main class="container">

<main>
{{outlet}}
</main>
<EsFooter />

{{!-- required by ember-cli-meta-tags --}}
<HeadLayout />
<EsFooter />
1 change: 1 addition & 0 deletions app/templates/ember-cli.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<section class="content">
<article class="chapter">
<h1>Ember CLI API Documentation</h1>
<hr>
<p>Ember CLI API documentation is available on <a href="https://ember-cli.com/api">ember-cli.com/api</a>.</p>
</article>
</section>
84 changes: 43 additions & 41 deletions app/templates/project-version.hbs
Original file line number Diff line number Diff line change
@@ -1,44 +1,46 @@
{{! template-lint-disable no-inline-styles }}
<aside class="sidebar">
<ol class="toc-level-0">
<li class="toc-level-0" data-test-home>
<LinkTo @route="project" @model="ember">Home</LinkTo>
</li>
<li class="toc-level-0">
Projects
<ol class="toc-level-1 selected" style="display: block;">
<li class="toc-level-1"><LinkTo @route="project" @model="ember" @current-when={{eq this.activeProject "ember"}} class="spec-ember">Ember</LinkTo></li>
<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>
<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>
</ol>
</li>
</ol>
<div class="sidebar-container">
<EsSidebar>
<ol class="toc-level-0">
<li class="toc-level-0" data-test-home>
<LinkTo @route="project" @model="ember">Home</LinkTo>
</li>
<li class="toc-level-0">
Projects
<ol class="toc-level-1 selected" style="display: block;">
<li class="toc-level-1"><LinkTo @route="project" @model="ember" @current-when={{eq this.activeProject "ember"}} class="spec-ember">Ember</LinkTo></li>
<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>
<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>
</ol>
</li>
</ol>

<div class="select-container">
<PowerSelect
@onChange={{route-action "updateProject" this.activeProject}}
@options={{this.projectVersions}}
@selected={{this.selectedProjectVersion}}
@ariaLabel="Select a version"
@required={{true}}
@searchField="compactVersion"
@searchEnabled={{true}}
as |ver|
>
{{ver.compactVersion}}
</PowerSelect>
</div>
<div class="select-container">
<PowerSelect
@onChange={{route-action "updateProject" this.activeProject}}
@options={{this.projectVersions}}
@selected={{this.selectedProjectVersion}}
@ariaLabel="Select a version"
@required={{true}}
@searchField="compactVersion"
@searchEnabled={{true}}
as |ver|
>
{{ver.compactVersion}}
</PowerSelect>
</div>

<TableOfContents
@version={{this.urlVersion}}
@classesIDs={{this.shownClassesIDs}}
@moduleIDs={{this.shownModuleIDs}}
@namespaceIDs={{this.shownNamespaceIDs}}
@showPrivateClasses={{this.showPrivateClasses}}
@togglePrivateClasses={{this.togglePrivateClasses}}
@isShowingNamespaces={{version-lt this.selectedProjectVersion.compactVersion "2.16"}}
/>
</aside>
<section class="content">
{{outlet}}
</section>
<TableOfContents
@version={{this.urlVersion}}
@classesIDs={{this.shownClassesIDs}}
@moduleIDs={{this.shownModuleIDs}}
@namespaceIDs={{this.shownNamespaceIDs}}
@showPrivateClasses={{this.showPrivateClasses}}
@togglePrivateClasses={{this.togglePrivateClasses}}
@isShowingNamespaces={{version-lt this.selectedProjectVersion.compactVersion "2.16"}}
/>
</EsSidebar>
<section class="content">
{{outlet}}
</section>
</div>
2 changes: 1 addition & 1 deletion app/templates/project-version/classes/class.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{/if}}
<h1 class="module-name">Class {{@model.name}}</h1>
{{#if @model.access}}<span class="access">{{@model.access}}</span>{{/if}}

<hr>
<div class="attributes">
{{#if @model.extends}}
<div class="attribute">
Expand Down
1 change: 1 addition & 0 deletions app/templates/project-version/functions/function.hbs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<h1 class="module-name">Function</h1>
<hr>
<ClassFieldDescription @type="method" @field={{@model.fn}} @model={{@model.fnModule}} />
1 change: 1 addition & 0 deletions app/templates/project-version/modules/module.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<h1 class="module-name">Package {{this.model.name}}</h1>
{{/if}}
{{#if this.model.access}}<span class="access">{{this.model.access}}</span>{{/if}}
<hr>

<p class="attributes">
{{#if this.model.parent}}
Expand Down
Loading