Merge branch 'master' into website-redesign-rfc

Author: mansona

CHANGELOG.md

@@ -1,4 +1,44 @@
 
+v3.1.1 / 2019-06-24
+==================
+
+  * Fix navbar formatting #185 from @jenweber
+
+v3.1.0 / 2018-06-22
+==================
+
+  * add es-section component #175 from @MelSumner
+  * [Doc] Update the Help Wanted link in nav bar #178 from @vasind
+  * Updated dnsimple target link in es-footer component from @sivakumar-kailasam
+
+v3.0.0 / 2018-05-23
+==================
+
+  * Updated ember-cli-addon-docs
+  * Update nav links to refer to new subdomains #173 from @sivakumar-kailasam
+  * removing node 6, bumping LTS versions for ember-try #172 from @melsumner
+  * Bump ember-bootstrap to get rid of ember.copy deprecation #170 from @sivakumar-kailasam
+  * Convert es-footer to be an angle bracket component #125 from @esbanarango & @hakilebara
+  * Add ember-angle-bracket-invocation-polyfill #163 from @amyrlam
+  * Update legal and releases links #159 from @j-brennan
+  * fixing accessibility bugs on navbar toggle button and footer links #149 from @alexpark90
+  * Comply with axe-core 2.2 #150 from @wycats
+  * Update _es-navbar.scss #147 from @melsumner
+  * Navbar tweaks #146 from @mansona
+  * Update _es-note.scss #144 from @melsumner
+  * fixing z-index of dropdown #143 from @aklkv
+  * Add closePopupMenu function to navbar service #142 from @patocallaghan
+  * es-navbar: hide menu items when navbar is closed #140 from @mansona
+  * Fixing default links #139 from @mansona
+  * Fixing issue with element not being available when setting tabIndex #136 from @mansona
+  * replacing → with → #137 from @mansona
+  * Fully Accessible and Bootstrap-Free navbar #77 from @mansona
+  * update `links.js` #132 from @locks
+  * extract docs-note to a separate component #131 from @sivakumar-kailasam
+  * use angle-bracket syntax for es-blog-heading component #128 from @jbailey4
+  * use angle-bracket syntax for es-buttonbar component #127 from @jbailey4
+  * use angle-bracket syntax for es-note component #126 from @jbailey4
+
 v2.5.0 / 2018-12-06
 ==================
 

README.md

@@ -33,5 +33,4 @@ See the [Contributing](CONTRIBUTING.md) guide for details.
 * Each component must have the component name attached to the component as a CSS class.
 * It may feel as though there is duplicated code throughout these components; during the WIP process, we are favoring duplication over abstraction.
 * Font icons through [ember-fontawesome](https://fontawesome.com/how-to-use/on-the-web/using-with/ember) - it is supported by the font awesome team and they render to SVG.
-* The `es-pagewrapper` component has a property to indicate if there will be a sidebar or not. There might be a better way to do this.
 * In this addon, the `section` element is used as a container and is intended to span the full width of the viewport.

addon/components/es-pagewrapper.js

@@ -35,7 +35,7 @@ const contributorLinks = [{
 }, {
   name: 'Resolved with:',
   title: "Dnsimple",
-  href: 'https://dnsimple.com/resolving/emberjs',
+  href: 'https://dnsimple.link/resolving-emberjs',
   class: 'dnsimple-logo-dark'
 }];
 

addon/constants/es-footer.js

@@ -6,7 +6,7 @@ export default [{
     name: 'Ember.js Guides',
     type: 'link'
   }, {
-    href: 'https://emberjs.com/api',
+    href: 'https://api.emberjs.com',
     name: 'API Reference',
     type: 'link'
   }, {
@@ -24,34 +24,42 @@ export default [{
   name: 'Releases',
   type: 'dropdown',
   items: [{
-    href: 'https://emberjs.com/builds',
-    name: 'Channels',
+    href: 'https://emberjs.com/releases',
+    name: 'Overview',
     type: 'link'
   }, {
-    href: 'https://emberjs.com/builds/release',
+    href: 'https://emberjs.com/releases/lts',
+    name: '→ LTS',
+    type: 'link'
+  }, {
+    href: 'https://emberjs.com/releases/release',
     name: '→ Stable',
     type: 'link'
   }, {
-    href: 'https://emberjs.com/builds/beta',
+    href: 'https://emberjs.com/releases/beta',
     name: '→ Beta',
     type: 'link'
   }, {
-    href: 'https://emberjs.com/builds/canary',
+    href: 'https://emberjs.com/releases/canary',
     name: '→ Canary',
     type: 'link'
   }, {
     type: 'divider'
   }, {
-    href: 'https://emberjs.com/deprecations',
+    href: 'https://emberjs.com/editions',
+    name: 'Editions',
+    type: 'link'
+  }, {
+    href: 'https://deprecations.emberjs.com',
     name: 'Deprecations',
     type: 'link'
   }, {
-    href: 'https://emberjs.com/statusboard',
-    name: 'Status Board',
+    href: 'https://github.com/emberjs/rfc-tracking/issues',
+    name: 'RFC Tracking',
     type: 'link'
   }]
 }, {
-  href: 'https://emberjs.com/blog',
+  href: 'https://blog.emberjs.com',
   name: 'Blog',
   type: 'link'
 }, {
@@ -66,7 +74,7 @@ export default [{
     name: 'Guidelines',
     type: 'link'
   }, {
-    href: 'http://github.com/emberjs/',
+    href: 'https://help-wanted.emberjs.com/',
     name: 'Contribute (Github)',
     type: 'link'
   }, {
@@ -116,7 +124,7 @@ export default [{
   }, {
     type: 'divider'
   }, {
-    href: 'https://emberjs.com/legal',
+    href: 'https://emberjs.com/about/legal',
     name: 'Legal',
     type: 'link'
   }, {

addon/constants/links.js

@@ -9,5 +9,5 @@
       {{/if}}
     </div>
   </div>
-  <img src={{imageUrl}} role="presentation" alt="Ember Mascot" class="hide-in-percy">
-</div>
+  <img src={{imageUrl}} role="presentation" alt="" class="hide-in-percy">
+</div>

addon/templates/components/es-note.hbs

@@ -1,6 +1,6 @@
 {
   "name": "ember-styleguide",
-  "version": "2.5.0",
+  "version": "3.1.1",
   "description": "Addon to help standardize the ember family of websites",
   "keywords": [
     "ember-addon"

addon/templates/components/es-pagewrapper.hbs

@@ -1,22 +1,18 @@
-import { module, skip } from 'qunit';
+import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | es footer', function(hooks) {
   setupRenderingTest(hooks);
 
-  skip('it renders', async function(assert) {
-    await render(hbs`{{es-footer}}`);
+  test('it renders', async function(assert) {
+    await render(hbs`<EsFooter/>`);
 
-    const footerSocialLinks = document.querySelectorAll('.footer-social a');
-    const footerContribtuionsLinks = document.querySelectorAll('.footer-contributions .contributor');
-    const footer = document.querySelector('.footer');
-    const footerStyle = window.getComputedStyle(footer, null);
-    const footerBgColor = footerStyle.getPropertyValue('background-color');
+    const footerSocialLinks = this.element.querySelectorAll('.footer-social a');
+    const footerContribtuionsLinks = this.element.querySelectorAll('.footer-contributions a');
 
     assert.equal(footerSocialLinks.length, 3, 'social links are loading');
     assert.equal(footerContribtuionsLinks.length, 4, 'contributors links are loading');
-    assert.equal(footerBgColor, 'rgb(242, 236, 233)', 'background color is rendering');
   });
 });