Skip to content

Commit

Permalink
Merge pull request DockYard#34 from nathanhammond/add-ember-a11y
Browse files Browse the repository at this point in the history
Add in ember-a11y.
  • Loading branch information
kategengler committed Mar 29, 2016
2 parents db060ae + 370b7b8 commit 2da10cf
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 12 deletions.
3 changes: 0 additions & 3 deletions app/components/page-layout-with-search.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ export default Ember.Component.extend(FocusableComponent, {
routing: Ember.inject.service('-routing'),
focusNode: '#search-input',
showCategories: true,
didInsertElement() {
this.focus();
},
init() {
this._super(...arguments);
this.get('search').perform(this.get('query'));
Expand Down
4 changes: 4 additions & 0 deletions app/styles/components/_page-layout-with-search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
margin-top: 1.5rem;
}

.search-wrapper button {
padding: 0; background: none;
}

.name {
color: #70B3DB;
font-size: 2rem;
Expand Down
2 changes: 1 addition & 1 deletion app/templates/addons.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{outlet}}
{{focusing-outlet}}
2 changes: 1 addition & 1 deletion app/templates/admin.hbs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{outlet}}
{{focusing-outlet}}

2 changes: 1 addition & 1 deletion app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container">
{{#page-layout-with-search query=query showCategories=shouldShowCategories}}
{{outlet}}
{{focusing-outlet}}
{{/page-layout-with-search}}
<footer class="footer" role="contentinfo">
<hr>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/categories.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{outlet}}
{{focusing-outlet}}
6 changes: 3 additions & 3 deletions app/templates/components/page-layout-with-search.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<header class="navigation">
{{#link-to "index" (query-params query="") class="name"}}Ember Observer{{/link-to}}
<nav class="links">
{{#link-to "about"}}| About |{{/link-to}}
{{#link-to "about"}}About{{/link-to}}
</nav>
{{!--<a href="#" class="show-menu"><span class="icon-more-horiz"></span></a>--}}
<div class="search-wrapper">
Expand All @@ -15,11 +15,11 @@
value={{query}}
oninput={{action (perform search) value="target.value"}}>
{{#if query}}
<a href="#" {{action clearSearch}} class="icon-close test-clear-search"></a>
<button {{action clearSearch}} class="icon-close test-clear-search"></button>
{{/if}}
</div>
{{#if session.isAuthenticated}}
<a href="#" {{action logoutUser}} class="logout">Log out</a>
<button {{action logoutUser}} class="logout">Log out</button>
{{/if}}
<h6 class="no-results {{if hasSearchedAndNoResults 'showing'}}">No results found for "{{query}}"</h6>
</header>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/lists.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{outlet}}
{{focusing-outlet}}
2 changes: 1 addition & 1 deletion app/templates/maintainers.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{outlet}}
{{focusing-outlet}}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"active-model-adapter": "^2.1.1",
"broccoli-asset-rev": "^2.2.0",
"broccoli-jscs": "^1.4.0",
"ember-a11y": "0.1.7",
"ember-ajax": "0.7.1",
"ember-cli": "2.4.2",
"ember-cli-app-version": "^1.0.0",
Expand Down

0 comments on commit 2da10cf

Please sign in to comment.