Skip to content

Commit c10c831

Browse files
petebacondarwinalexeagle
authored andcommitted
build(aio): render subclasses + see-also block in the main flow (angular#22445)
Closes angular#22386 PR Close angular#22445
1 parent 40ba009 commit c10c831

File tree

5 files changed

+6
-52
lines changed

5 files changed

+6
-52
lines changed

aio/src/styles/2-modules/_api-pages.scss

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,6 @@
88
}
99
}
1010

11-
.sidebar {
12-
box-shadow: 0 2px 2px rgba(10, 16, 20, 0.24), 0 0 2px rgba(10, 16, 20, 0.12);
13-
border-radius: 2px;
14-
background: #FAFAFA;
15-
float: right;
16-
margin: 20px;
17-
padding: 0 24px 14px;
18-
19-
h2 {
20-
margin: 18px 0 4px;
21-
}
22-
23-
ul {
24-
margin: 0;
25-
padding-left: 14px;
26-
}
27-
}
28-
.inline-sidebar {
29-
display: none;
30-
}
31-
32-
@media (max-width: 1200px) {
33-
.sidebar {
34-
display: none;
35-
}
36-
.inline-sidebar {
37-
display: block;
38-
}
39-
}
40-
41-
4211
.method-table {
4312
h3 {
4413
margin: 6px 0;

aio/tests/e2e/api.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class ApiPage extends SitePage {
2424
//
2525
// and we want to be able to pull out the code elements from only the first level
2626
// if `onlyDirect` is set to `true`.
27-
const selector = `.inline-sidebar .descendants.${docType} ${onlyDirect ? '>' : ''} ul > li > code`;
27+
const selector = `.descendants.${docType} ${onlyDirect ? '>' : ''} ul > li > code`;
2828
return element.all(by.css(selector)).map<string>(item => item && item.getText());
2929
}
3030

aio/tools/transforms/templates/api/includes/class-overview.html

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,10 @@
22

33
<section class="{$ doc.docType $}-overview">
44
<h2>Overview</h2>
5-
{% if (doc.descendants | filterByPropertyValue('docType', 'class')).length or doc.see.length %}
6-
<div class="sidebar">
7-
{$ descendants.renderDescendants(doc, 'class', 'Subclasses') $}
8-
{% include "includes/see-also.html" %}
9-
</div>
10-
{% endif %}
115
<code-example language="ts" hideCopy="true">
126
{$ doc.docType $} {$ doc.name $}{$ doc.typeParams | escape $}{$ memberHelper.renderHeritage(doc) $} {{$ memberHelper.renderMembers(doc) $}
137
}
148
</code-example>
15-
<div class="inline-sidebar">
16-
{$ descendants.renderDescendants(doc, 'class', 'Subclasses') $}
17-
{% include "includes/see-also.html" %}
18-
</div>
9+
{$ descendants.renderDescendants(doc, 'class', 'Subclasses') $}
10+
{% include "includes/see-also.html" %}
1911
</section>

aio/tools/transforms/templates/api/includes/interface-overview.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
<section class="interface-overview">
44
<h2>Interface Overview</h2>
5-
<div class="sidebar">
6-
{$ descendants.renderDescendants(doc, 'interface', 'Child Interfaces') $}
7-
{$ descendants.renderDescendants(doc, 'class', 'Class Implementations') $}
8-
{% include "includes/see-also.html" %}
9-
</div>
105
<code-example language="ts" hideCopy="true">
116
interface {$ doc.name $}{$ doc.typeParams | escape $}{$ memberHelper.renderHeritage(doc) $} {{$ memberHelper.renderMembers(doc) $}
127
}
138
</code-example>
9+
{$ descendants.renderDescendants(doc, 'interface', 'Child Interfaces') $}
10+
{$ descendants.renderDescendants(doc, 'class', 'Class Implementations') $}
11+
{% include "includes/see-also.html" %}
1412
</section>

aio/tools/transforms/templates/api/interface.template.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
{% block overview %}{% include "includes/interface-overview.html" %}{% endblock %}
77
{% block details %}
88
{% include "includes/description.html" %}
9-
<div class="inline-sidebar">
10-
{$ descendants.renderDescendants(doc, 'interface', 'Child Interfaces') $}
11-
{$ descendants.renderDescendants(doc, 'class', 'Class Implementations') $}
12-
{% include "includes/see-also.html" %}
13-
</div>
149
{$ memberHelper.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $}
1510
{$ memberHelper.renderMethodDetails(doc.methods, 'instance-methods', 'instance-method', 'Methods') $}
1611
{% endblock %}

0 commit comments

Comments
 (0)