Merge branch 'master' into esulisttests

Author: RobbieTheWagner

CHANGELOG.md

@@ -1,4 +1,16 @@
 
+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
 ==================
 

addon/components/es-navbar/link/template.hbs

@@ -19,7 +19,7 @@
   >
     {{link.name}}
   </a>
-  <ul class="dropdown" role="menu" aria-label={{link.name}}>
+  <ul class="dropdown dropdown-menu" role="menu" aria-label={{link.name}}>
     {{#each link.items as |item|}}
       {{#if (eq item.type "link")}}
         <li role="none">

addon/components/es-section.js

@@ -0,0 +1,6 @@
+import Component from '@ember/component';
+import layout from '../templates/components/es-section';
+
+export default Component.extend({
+  layout
+});

addon/constants/es-footer.js

@@ -32,7 +32,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/links.js

@@ -25,7 +25,11 @@ export default [{
   type: 'dropdown',
   items: [{
     href: 'https://emberjs.com/releases',
-    name: 'Channels',
+    name: 'Overview',
+    type: 'link'
+  }, {
+    href: 'https://emberjs.com/releases/lts',
+    name: '→ LTS',
     type: 'link'
   }, {
     href: 'https://emberjs.com/releases/release',
@@ -41,13 +45,17 @@ export default [{
     type: 'link'
   }, {
     type: 'divider'
+  }, {
+    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'
   }]
 }, {

addon/styles/_es-navbar.scss

@@ -109,10 +109,6 @@ ul[role="menubar"] > li.dropdown > a:after {
   border-left: 4px solid transparent;
 }
 
-ul[role="menubar"][aria-expanded="true"] ul[role="menu"]{
-  top: 0 !important;
-}
-
 ul[role="menubar"] ul[role="menu"] {
   display: none;
   width: 100%;

addon/styles/_es-section.scss

@@ -0,0 +1,12 @@
+.es-section {
+
+  &.dark {
+    background-color: $black;
+    color: $white;
+  }
+  &.accent {
+    .es-heading {
+      color: $orange;
+    }
+  }
+}

addon/styles/addon.scss

@@ -11,7 +11,9 @@
 @import 'ember-bootstrap/navbar';
 @import 'ember-bootstrap/transitions';
 
+@import 'es-accordion';
 @import 'es-aside';
+@import 'es-blog-heading';
 @import 'es-button';
 @import 'es-buttonbar';
 @import 'es-card';
@@ -21,10 +23,9 @@
 @import 'es-heading';
 @import 'es-main';
 @import 'es-navbar';
-@import 'es-ulist';
 @import 'es-note';
-@import 'es-accordion';
-@import 'es-blog-heading';
+@import 'es-section';
+@import 'es-ulist';
 
 h1, h2, h3, h4, h5, h6 {
     -webkit-font-smoothing: antialiased;
@@ -38,24 +39,6 @@ body {
   color: $black;
   padding: 0;
   margin: 0;
-  //.pagewrapper-aside {
-  //  display: grid;
-  //  grid-gap: 20px;
-  //  grid-template-areas: "header" "content" "sidebar" "footer";
-  //  @media (min-width: 600px) {
-  //    grid-template-columns: 1fr 3fr;
-  //    grid-template-areas: "header header" "sidebar content" "footer footer";
-  //  }
-  //}
-  //.pagewrapper {
-  //  display: grid;
-  //  grid-gap: 20px;
-  //  grid-template-areas: "header" "content" "footer";
-  //  @media (min-width: 600px) {
-  //    grid-template-columns: 1fr;
-  //    grid-template-areas: "header" "content" "footer";
-  //  }
-  //}
 }
 
 section {

addon/templates/components/es-section.hbs

@@ -0,0 +1 @@
+{{yield}}

app/components/es-section.js

@@ -0,0 +1 @@
+export { default } from 'ember-styleguide/components/es-section';

package.json

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

tests/dummy/app/templates/application.hbs

@@ -1,2 +1,4 @@
 {{docs-header}}
-{{outlet}}
+<main>
+  {{outlet}}
+</main>

tests/integration/components/es-section-test.js

@@ -0,0 +1,26 @@
+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-section', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function(assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`{{es-section}}`);
+
+    assert.equal(this.element.textContent.trim(), '');
+
+    // Template block usage:
+    await render(hbs`
+      {{#es-section}}
+        template block text
+      {{/es-section}}
+    `);
+
+    assert.equal(this.element.textContent.trim(), 'template block text');
+  });
+});