Skip to content

Commit af92b4f

Browse files
committed
Touchups and dep fixes
1 parent c9b0dd7 commit af92b4f

File tree

11 files changed

+63
-18
lines changed

11 files changed

+63
-18
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
- Adds new `section` contextual component yielded from DocsViewer
66
- Renames `{{docs-navbar}}` to `{{docs-header}}`
7+
- Removes yield for alt-logo in docs-hero (was anyone using this?)
8+
- Adds `style` attr to docs-hero which can be "light" or "dark". Defaults to "light".
9+
- Simpler /docs/template.hbs setup (viewer.main outlet)
710

811
## 0.2.4
912

addon/components/api/x-class/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h1>{{class.name}}</h1>
1+
<h1 class='docs-h1'>{{class.name}}</h1>
22

33
{{! wrapping in a div seems to work around https://github.com/ember-learn/ember-cli-addon-docs/issues/7 }}
44
<div>{{{class.description}}}</div>

addon/components/docs-hero/component.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ export default Component.extend({
1919
layout,
2020
tagName: '',
2121

22+
/**
23+
The style of the header, "light" or "dark". Defaults to light.
24+
25+
@argument style
26+
@type String
27+
*/
28+
style: 'light',
29+
2230
/**
2331
The logo to show, one of: 'ember', 'ember-cli', or 'ember-data'
2432
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
<div class="text-center text-grey-darkest py-8 md:py-16">
1+
<div class="
2+
text-center py-8 md:py-16
3+
{{if (eq style 'light') 'text-grey-darkest'}}
4+
{{if (eq style 'dark') 'bg-black text-white'}}
5+
">
26
<div class='docs-container'>
3-
<h1 class='text-5xl leading-none'>
4-
{{#if hasBlock}}
5-
{{yield}}
6-
{{else if logo}}
7-
<div>
8-
<span class='inline-block h-6'>
7+
<h1 class='text-5xl md:text-jumbo leading-none'>
8+
{{#if logo}}
9+
<div class='md:-mb-1 -mt-4 md:-mt-8'>
10+
<span class='inline-block h-6 opacity-50'>
911
{{docs-logo logo=logo}}
1012
</span>
1113
</div>
@@ -14,8 +16,10 @@
1416
<span class='font-thin'>{{slimHeading}}</span>{{strongHeading}}
1517
</h1>
1618

17-
<p class='text-grey-darker text-lg mt-4 w-3/4 mx-auto leading-tight'>
19+
<p class='opacity-75 text-xl mt-4 w-3/4 mx-auto leading-tight'>
1820
{{byline}}
1921
</p>
22+
23+
{{yield}}
2024
</div>
2125
</div>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@
6868

6969
<div class="mt-16 mr-2 text-xs rounded">
7070
<a href="https://github.com/ember-learn/ember-cli-addon-docs"
71-
class='opacity-50 hover:opacity-100 transition no-underline text-inherit flex items-center'>
72-
{{svg-jar 'logo-horizontal' width=22 height=16 class='mr-2'}}
71+
class='opacity-50 hover:opacity-100 transition no-underline
72+
text-inherit flex items-center text-grey-darkest'>
73+
{{svg-jar 'addon-docs-pen' width=22 height=16 class='mr-2'}}
7374
<div>
7475
Powered by
7576
<span class="font-bold">AddonDocs</span>

addon/tailwind/config/modules.css

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,14 @@ pre {
126126

127127
/* Need to learn how to use Tailwind to generate the responsive stuff for this automatically */
128128
.mask-image {
129-
mask-image: linear-gradient(to right, transparent, black 20px, black 90%, transparent);
129+
/* Autoprefixer is in dependencies but not working on host apps */
130+
-webkit-mask-image: linear-gradient(to right, transparent, black 20px, black 90%, transparent);
131+
mask-image: linear-gradient(to right, transparent, black 20px, black 90%, transparent);
130132
}
131133
@media (min-width: 768px) {
132134
.md\:no-mask-image {
133-
mask-image: none;
135+
-webkit-mask-image: none;
136+
mask-image: none;
134137
}
135138
}
136139
.overflow-momentum {

addon/tailwind/text-sizes.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ export default {
2727
'3xl': '1.875rem', // 30px
2828
'4xl': '2.25rem', // 36px
2929
'5xl': '3rem', // 48px
30+
31+
'jumbo': '3.75rem'
3032
};

app/templates/docs/api/index.hbs

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/broccoli/docs-compiler.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,16 @@ function generateResolvedTypedNavigationItems(collection, file, type) {
148148
fileName = segments.pop();
149149
}
150150

151+
let name;
152+
if (['component', 'helper'].includes(type)) {
153+
name = `{{${fileName}}}`;
154+
} else {
155+
name = _.upperFirst(_.camelCase(fileName));
156+
}
157+
151158
return {
152159
path: `${type}s/${fileName}`,
153-
name: `{{${fileName}}}`
160+
name
154161
};
155162
});
156163
}

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,16 @@
4141
"ember-cli-tailwind": "0.2.7",
4242
"ember-code-snippet": "ef4/ember-code-snippet",
4343
"ember-component-css": "^0.3.5",
44+
"ember-concurrency": "^0.8.16",
4445
"ember-data": "^2.18.0",
4546
"ember-fetch": "^3.4.4",
4647
"ember-href-to": "^1.15.1",
4748
"ember-keyboard": "^3.0.0",
4849
"ember-modal-dialog": "2.4.3",
50+
"ember-responsive": "^3.0.0-beta.1",
4951
"ember-router-scroll": "^0.4.0",
5052
"ember-svg-jar": "^0.12.0",
53+
"ember-tether": "^1.0.0-beta.2",
5154
"ember-truth-helpers": "^2.0.0",
5255
"execa": "^0.9.0",
5356
"fs-extra": "^5.0.0",
@@ -90,17 +93,14 @@
9093
"ember-cli-shims": "^1.2.0",
9194
"ember-cli-sri": "^2.1.0",
9295
"ember-cli-uglify": "^2.0.0",
93-
"ember-concurrency": "^0.8.16",
9496
"ember-disable-prototype-extensions": "^1.1.3",
9597
"ember-export-application-global": "^2.0.0",
9698
"ember-load-initializers": "^1.0.0",
9799
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
98100
"ember-resolver": "^4.5.0",
99-
"ember-responsive": "^3.0.0-beta.1",
100101
"ember-source": "~3.0.0",
101102
"ember-source-channel-url": "^1.0.1",
102103
"ember-test-selectors": "^0.3.8",
103-
"ember-tether": "^1.0.0-beta.2",
104104
"ember-try": "^0.2.23",
105105
"eslint-plugin-ember": "^5.0.3",
106106
"eslint-plugin-node": "^5.2.1",

0 commit comments

Comments
 (0)