Skip to content

Commit a608dca

Browse files
Resolve issue with sidebar showing incorrectly on mobile (#921)
* fix: resolve issue with sidebar showing incorrectly on mobile * Remove initializer * Update template.hbs * Update modal dialog Co-authored-by: Robert Wagner <[email protected]>
1 parent 823afe3 commit a608dca

File tree

6 files changed

+12
-26
lines changed

6 files changed

+12
-26
lines changed

addon/components/docs-viewer/x-nav/component.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default Component.extend({
1515
root: 'docs',
1616

1717
store: service(),
18+
media: service(),
1819

1920
addonLogo: addonLogo(projectName),
2021

addon/components/docs-viewer/x-nav/template.hbs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{#if @media.isMobile}}
1+
{{#if this.media.isMobile}}
22
<div class="docs-text-right docs-px-4 md:docs-px-6 docs-mt-4">
33
<button {{on "click" (toggle "isShowingMenu" this)}}
44
class="docs-text-grey-darkest docs-py-2 docs-text-xs docs-rounded docs-uppercase docs-font-medium">
@@ -12,13 +12,13 @@
1212
class="
1313
docs-absolute docs-right-0 md:docs-relative docs-shadow-lg md:docs-shadow-none docs-mr-2 md:docs-mr-0 md:docs-pl-2
1414
docs-max-w-xs docs-w-90% md:docs-w-72 docs-z-10 docs-transition md:docs-sticky md:docs-top-0
15-
{{if @media.isMobile
16-
(if @isShowingMenu "docs-opacity-100 docs-bg-white" "docs-opacity-0 docs-pointer-events-none")
15+
{{if this.media.isMobile
16+
(if this.isShowingMenu "docs-opacity-100 docs-bg-white" "docs-opacity-0 docs-pointer-events-none")
1717
}}
1818
">
1919
<div class="docs-pt-px docs-mb-8 docs-px-3 md:docs-px-4 md:docs-max-h-screen md:docs-overflow-y-scroll">
20-
{{#if @media.isMobile}}
21-
<div class="docs-text-right">
20+
{{#if this.media.isMobile}}
21+
<div class="absolute top-0 docs-text-right right-4">
2222
<button onclick={{set this "isShowingMenu" false}}
2323
class="docs-text-grey-darkest docs-opacity-50 hover:docs-opacity-100 docs-text-large-5 docs-py-2 docs-no-underline">
2424
&times;
@@ -38,8 +38,7 @@
3838

3939
<div class="docs-mt-16 lg:docs-mb-16 docs-mr-2 docs-text-xxs docs-rounded">
4040
<a href="https://github.com/ember-learn/ember-cli-addon-docs"
41-
class="docs-opacity-50 hover:docs-opacity-100 docs-transition docs-no-underline
42-
docs-text-inherit docs-flex docs-items-center docs-text-grey-darkest">
41+
class="docs-opacity-50 hover:docs-opacity-100 docs-transition docs-no-underline docs-text-inherit docs-flex docs-items-center docs-text-grey-darkest">
4342
{{svg-jar "addon-docs-pen" width=22 height=16 class="docs-mr-2"}}
4443
<div>
4544
Powered by

addon/initializers/inject-media.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/initializers/inject-media.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"ember-get-config": "^0.3.0",
6868
"ember-href-to": "^4.0.0",
6969
"ember-keyboard": "^6.0.3",
70-
"ember-modal-dialog": "rwwagner90/ember-modal-dialog#012e8772a5581fbf318606b769b88908cdceba2e",
70+
"ember-modal-dialog": "yapplabs/ember-modal-dialog#76b74f1c4b791fed5b084836c3b1c8c54836ac71",
7171
"ember-responsive": "^4.0.2",
7272
"ember-router-generator": "^2.0.0",
7373
"ember-router-scroll": "^4.0.2",

yarn.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6690,10 +6690,12 @@ ember-maybe-import-regenerator-for-testing@^1.0.0:
66906690
ember-cli-babel "^6.6.0"
66916691
regenerator-runtime "^0.9.5"
66926692

6693-
ember-modal-dialog@rwwagner90/ember-modal-dialog#012e8772a5581fbf318606b769b88908cdceba2e:
6693+
ember-modal-dialog@yapplabs/ember-modal-dialog#76b74f1c4b791fed5b084836c3b1c8c54836ac71:
66946694
version "4.0.0-alpha.1"
6695-
resolved "https://codeload.github.com/rwwagner90/ember-modal-dialog/tar.gz/012e8772a5581fbf318606b769b88908cdceba2e"
6695+
resolved "https://codeload.github.com/yapplabs/ember-modal-dialog/tar.gz/76b74f1c4b791fed5b084836c3b1c8c54836ac71"
66966696
dependencies:
6697+
"@embroider/macros" "^0.43.5"
6698+
"@embroider/util" "^0.43.5"
66976699
ember-cli-babel "^7.26.6"
66986700
ember-cli-htmlbars "^5.7.1"
66996701
ember-cli-version-checker "^2.1.0"

0 commit comments

Comments
 (0)