Skip to content
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

Be more explicit on where label is located #404

Merged
merged 6 commits into from
Oct 10, 2019
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
4 changes: 2 additions & 2 deletions addon/components/docs-viewer/x-nav-item/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
activeClass='docs-text-brand docs-font-medium'
data-test-id='nav-item'
data-test-label=label}}
{{label}}
{{@label}}
{{/link-to}}
{{else}}
{{#link-to route
class='docs-text-grey-darker docs-no-underline hover:docs-underline'
activeClass='docs-text-brand docs-font-medium'
data-test-id='nav-item'
data-test-label=label}}
{{label}}
{{@label}}
{{/link-to}}
{{/if}}
</li>
2 changes: 1 addition & 1 deletion addon/components/docs-viewer/x-section/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
{{#if hasBlock}}
{{yield}}
{{else}}
{{label}}
{{@label}}
{{/if}}
</li>
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"broccoli-source": "^1.1.0",
"broccoli-stew": "^2.0.0",
"chalk": "^2.4.2",
"ember-angle-bracket-invocation-polyfill": "^2.0.2",
"ember-assign-polyfill": "^2.6.0",
"ember-auto-import": "^1.5.2",
"ember-cli-autoprefixer": "^0.8.1",
Expand All @@ -57,6 +58,7 @@
"ember-href-to": "^1.15.1",
"ember-keyboard": "^4.0.0",
"ember-modal-dialog": "^3.0.0-beta.4",
"ember-named-arguments-polyfill": "^1.0.0",
"ember-responsive": "^3.0.5",
"ember-router-generator": "^2.0.0",
"ember-router-scroll": "^1.2.1",
Expand Down
22 changes: 20 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4795,6 +4795,16 @@ elliptic@^6.0.0:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.0"

ember-angle-bracket-invocation-polyfill@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/ember-angle-bracket-invocation-polyfill/-/ember-angle-bracket-invocation-polyfill-2.0.2.tgz#117ab5238305f11046a2eb3a5bc026c98d2cf5c1"
integrity sha512-HkG0xyTHtAhWVjU0Q5V/i4xe4FRvNIOaiUEgIvN815F3TIUboV/J0xhYgivm0uDZp9lAYUVF+U5PI1sCnlC3Og==
dependencies:
ember-cli-babel "^6.17.0"
ember-cli-version-checker "^2.1.2"
ember-compatibility-helpers "^1.0.2"
silent-error "^1.1.1"

ember-app-scheduler@^1.0.5:
version "1.0.8"
resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-1.0.8.tgz#37adacce2fa5ab59324e2c0b08f3c4a3568025b4"
Expand Down Expand Up @@ -4899,7 +4909,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==

ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.17.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
version "6.18.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
Expand Down Expand Up @@ -5450,7 +5460,7 @@ ember-code-snippet@^2.4.1:
es6-promise "^1.0.0"
glob "^7.1.3"

ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0:
ember-compatibility-helpers@^1.0.2, ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.0.tgz#feee16c5e9ef1b1f1e53903b241740ad4b01097e"
integrity sha512-pUW4MzJdcaQtwGsErYmitFRs0rlCYBAnunVzlFFUBr4xhjlCjgHJo0b53gFnhTgenNM3d3/NqLarzRhDTjXRTg==
Expand Down Expand Up @@ -5653,6 +5663,14 @@ ember-modal-dialog@^3.0.0-beta.4:
ember-ignore-children-helper "^1.0.1"
ember-wormhole "^0.5.5"

ember-named-arguments-polyfill@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/ember-named-arguments-polyfill/-/ember-named-arguments-polyfill-1.0.0.tgz#0b81fb81a7cef2c89e9e1d0278b579e708bf4ded"
integrity sha1-C4H7gafO8sienh0CeLV55wi/Te0=
dependencies:
ember-cli-babel "^6.6.0"
ember-cli-version-checker "^2.1.2"

ember-native-dom-helpers@^0.5.3:
version "0.5.10"
resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.5.10.tgz#9c7172e4ddfa5dd86830c46a936e2f8eca3e5896"
Expand Down