Skip to content

Commit

Permalink
More ui/error-page cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nummi committed Feb 23, 2019
1 parent fed1e20 commit 4a793c5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 31 deletions.
26 changes: 14 additions & 12 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,21 @@

{{else}}
{{#ui/error-page description="Ember application not detected!"}}
<li>This is not an Ember application.</li>
<li>You are using an old version of Ember (&lt; rc5).</li>
{{#if isChrome}}
<li>
You are using the file:// protocol (instead of http://), in which case:
<ul>
<li>This is not an Ember application.</li>
<li>You are using an old version of Ember (&lt; rc5).</li>
{{#if isChrome}}
<li>
You are using the file:// protocol (instead of http://), in which case:

<ul>
<li>Visit the URL: chrome://extensions.</li>
<li>Find the Ember Inspector.</li>
<li>Make sure "Allow access to file URLs" is checked.</li>
</ul>
</li>
{{/if}}
<ul>
<li>Visit the URL: chrome://extensions.</li>
<li>Find the Ember Inspector.</li>
<li>Make sure "Allow access to file URLs" is checked.</li>
</ul>
</li>
{{/if}}
</ul>
{{/ui/error-page}}
{{/if}}
{{/x-app}}
18 changes: 10 additions & 8 deletions app/templates/data/index.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{{#ui/error-page description="Data adapter not detected!"}}
<li>You are using an old version of Ember (&lt; rc7).</li>
<li>You are using an old version of Ember Data (&lt; 0.14).</li>
<li>
You are using another persistence library, in which case:
<ul>
<li>Make sure the library has a data adapter.</li>
</ul>
</li>
<ul>
<li>You are using an old version of Ember (&lt; rc7).</li>
<li>You are using an old version of Ember Data (&lt; 0.14).</li>
<li>
You are using another persistence library, in which case:
<ul>
<li>Make sure the library has a data adapter.</li>
</ul>
</li>
</ul>
{{/ui/error-page}}
11 changes: 4 additions & 7 deletions lib/ui/addon/styles/_error-page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,21 @@
padding-top: 25px;
}

.error-page__reasons {
.error-page__body {
border-bottom: 1px solid var(--base04);
padding-bottom: 10px;
}

.error-page__reasons-title {
.error-page__body-title {
font-weight: bold;
}

.error-page__reasons ul {
.error-page__body ul {
list-style-type: disc;
}

.error-page__list {
padding-left: 16px;
}

.error-page__list li {
.error-page__body li {
padding: 2px 0;
}

Expand Down
8 changes: 4 additions & 4 deletions lib/ui/addon/templates/components/error-page.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<img class="tomster" src="assets/images/fishy_tomster.png" alt="Fishy Tomster">
</div>

<div class="error-page__reasons">
<div class="error-page__reasons-title">
{{#if reasonsTitle}}
{{reasonsTitle}}
<div class="error-page__body">
<div class="error-page__body-title">
{{#if bodyTitle}}
{{bodyTitle}}
{{else}}
Here are some common reasons this happens:
{{/if}}
Expand Down

0 comments on commit 4a793c5

Please sign in to comment.