Skip to content

Commit ca91352

Browse files
authored
Merge branch 'master' into esulisttests
2 parents 33d5651 + 236305d commit ca91352

File tree

12 files changed

+2024
-503
lines changed

12 files changed

+2024
-503
lines changed

.ember-cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": true
99
}

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "6"
6+
- "8"
77

88
sudo: false
99
dist: trusty
@@ -37,8 +37,8 @@ jobs:
3737
# we recommend new addons test the current and previous LTS
3838
# as well as latest stable release (bonus points to beta/canary)
3939
- stage: "Additional Tests"
40-
env: EMBER_TRY_SCENARIO=ember-lts-2.16
41-
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
40+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
41+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
4242
- env: EMBER_TRY_SCENARIO=ember-release
4343
- env: EMBER_TRY_SCENARIO=ember-beta
4444
- env: EMBER_TRY_SCENARIO=ember-canary

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
11

2+
v3.0.0 / 2018-05-23
3+
==================
4+
5+
* Updated ember-cli-addon-docs
6+
* Update nav links to refer to new subdomains #173 from @sivakumar-kailasam
7+
* removing node 6, bumping LTS versions for ember-try #172 from @melsumner
8+
* Bump ember-bootstrap to get rid of ember.copy deprecation #170 from @sivakumar-kailasam
9+
* Convert es-footer to be an angle bracket component #125 from @esbanarango & @hakilebara
10+
* Add ember-angle-bracket-invocation-polyfill #163 from @amyrlam
11+
* Update legal and releases links #159 from @j-brennan
12+
* fixing accessibility bugs on navbar toggle button and footer links #149 from @alexpark90
13+
* Comply with axe-core 2.2 #150 from @wycats
14+
* Update _es-navbar.scss #147 from @melsumner
15+
* Navbar tweaks #146 from @mansona
16+
* Update _es-note.scss #144 from @melsumner
17+
* fixing z-index of dropdown #143 from @aklkv
18+
* Add closePopupMenu function to navbar service #142 from @patocallaghan
19+
* es-navbar: hide menu items when navbar is closed #140 from @mansona
20+
* Fixing default links #139 from @mansona
21+
* Fixing issue with element not being available when setting tabIndex #136 from @mansona
22+
* replacing → with → #137 from @mansona
23+
* Fully Accessible and Bootstrap-Free navbar #77 from @mansona
24+
* update `links.js` #132 from @locks
25+
* extract docs-note to a separate component #131 from @sivakumar-kailasam
26+
* use angle-bracket syntax for es-blog-heading component #128 from @jbailey4
27+
* use angle-bracket syntax for es-buttonbar component #127 from @jbailey4
28+
* use angle-bracket syntax for es-note component #126 from @jbailey4
29+
230
v2.5.0 / 2018-12-06
331
==================
432

addon/components/es-navbar/link/component.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Component from '@ember/component';
22
import layout from './template';
3-
import { computed } from '@ember/object';
43
import { equal } from '@ember/object/computed';
54
import { inject as service } from '@ember/service';
65
import { next } from '@ember/runloop';
@@ -10,7 +9,10 @@ export default Component.extend({
109
tagName: 'li',
1110
tabIndex: 0,
1211

12+
expanded: false,
13+
1314
classNameBindings: ['isDropdown:dropdown'],
15+
attributeBindings: ['expanded:ariaExpanded'],
1416
isDropdown: equal('link.type', 'dropdown'),
1517

1618
keyCode: Object.freeze({
@@ -90,15 +92,6 @@ export default Component.extend({
9092
}
9193
},
9294

93-
expanded: computed({
94-
get() {
95-
return this.element.getAttribute('aria-expanded') === 'true';
96-
},
97-
set(key, value) {
98-
this.element.setAttribute('aria-expanded', value);
99-
}
100-
}).volatile(),
101-
10295
setFocusToFirstItem() {
10396
let element = this.element.querySelector('ul[role="menu"] li a')
10497
if (element) {

addon/constants/links.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default [{
66
name: 'Ember.js Guides',
77
type: 'link'
88
}, {
9-
href: 'https://emberjs.com/api',
9+
href: 'https://api.emberjs.com',
1010
name: 'API Reference',
1111
type: 'link'
1212
}, {
@@ -42,7 +42,7 @@ export default [{
4242
}, {
4343
type: 'divider'
4444
}, {
45-
href: 'https://emberjs.com/deprecations',
45+
href: 'https://deprecations.emberjs.com',
4646
name: 'Deprecations',
4747
type: 'link'
4848
}, {
@@ -51,7 +51,7 @@ export default [{
5151
type: 'link'
5252
}]
5353
}, {
54-
href: 'https://emberjs.com/blog',
54+
href: 'https://blog.emberjs.com',
5555
name: 'Blog',
5656
type: 'link'
5757
}, {
@@ -66,7 +66,7 @@ export default [{
6666
name: 'Guidelines',
6767
type: 'link'
6868
}, {
69-
href: 'http://github.com/emberjs/',
69+
href: 'https://help-wanted.emberjs.com/',
7070
name: 'Contribute (Github)',
7171
type: 'link'
7272
}, {

config/ember-try.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ module.exports = function() {
1212
useYarn: true,
1313
scenarios: [
1414
{
15-
name: 'ember-lts-2.16',
15+
name: 'ember-lts-2.18',
1616
env: {
1717
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
1818
},
1919
npm: {
2020
devDependencies: {
2121
'@ember/jquery': '^0.5.1',
22-
'ember-source': '~2.16.0'
22+
'ember-source': '~2.18.0'
2323
}
2424
}
2525
},
2626
{
27-
name: 'ember-lts-2.18',
27+
name: 'ember-lts-3.4',
2828
env: {
2929
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
3030
},
3131
npm: {
3232
devDependencies: {
3333
'@ember/jquery': '^0.5.1',
34-
'ember-source': '~2.18.0'
34+
'ember-source': '~3.4.0'
3535
}
3636
}
3737
},

ember-cli-build.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ module.exports = function(defaults) {
77
sassOptions: {
88
implementation: nodeSass
99
},
10-
fontawesome: {
11-
icons: {
12-
'free-solid-svg-icons': 'all',
13-
'free-regular-svg-icons': 'all',
14-
}
15-
},
1610
svgJar: {
1711
sourceDirs: [
1812
'public',

index.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ module.exports = {
2121
googleFonts: [
2222
'Roboto:400,700'
2323
],
24+
fontawesome: {
25+
icons: {
26+
'free-solid-svg-icons': 'all',
27+
'free-regular-svg-icons': 'all',
28+
}
29+
},
2430
},
2531

2632
included(app, parentAddon) {

jsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-styleguide",
3-
"version": "2.5.0",
3+
"version": "3.0.0",
44
"description": "Addon to help standardize the ember family of websites",
55
"keywords": [
66
"ember-addon"
@@ -29,8 +29,8 @@
2929
"bootstrap": "^4.1.3",
3030
"broccoli-funnel": "^2.0.1",
3131
"broccoli-merge-trees": "^3.0.1",
32-
"ember-bootstrap": "^2.1.2",
33-
"ember-cli-babel": "^7.1.2",
32+
"ember-bootstrap": "^2.6.2",
33+
"ember-cli-babel": "^7.7.3",
3434
"ember-cli-google-fonts": "^2.16.2",
3535
"ember-cli-htmlbars": "^3.0.0",
3636
"ember-cli-sass": "^8.0.1",
@@ -47,7 +47,7 @@
4747
"ember-a11y-landmarks": "^1.0.1",
4848
"ember-angle-bracket-invocation-polyfill": "^1.3.0",
4949
"ember-cli": "~3.5.0",
50-
"ember-cli-addon-docs": "^0.6.0",
50+
"ember-cli-addon-docs": "^0.6.12",
5151
"ember-cli-addon-docs-yuidoc": "^0.2.1",
5252
"ember-cli-autoprefixer": "^0.8.1",
5353
"ember-cli-dependency-checker": "^3.0.0",
@@ -90,7 +90,7 @@
9090
"stylelint-scss": "^3.3.1"
9191
},
9292
"engines": {
93-
"node": "6.* || 8.* || >= 10.*"
93+
"node": "8.* || >= 10.*"
9494
},
9595
"publishConfig": {
9696
"access": "public"

0 commit comments

Comments
 (0)