Skip to content

Commit

Permalink
Merge pull request #157 from PolymerElements/301
Browse files Browse the repository at this point in the history
Fix issues affecting polymer-project.org site.
  • Loading branch information
aomarks authored Jun 23, 2017
2 parents f9223a9 + fab89a3 commit 61c95d0
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion iron-doc-behavior.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h2>
</h2>

<marked-element sanitize markdown="[[descriptor.description]]">
<div slot="markdown-html"></div>
<div slot="markdown-html" class="markdown-html"></div>
</marked-element>
</section>

Expand Down
2 changes: 1 addition & 1 deletion iron-doc-class.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ <h2>
</h2>

<marked-element sanitize markdown="[[descriptor.description]]">
<div slot="markdown-html"></div>
<div slot="markdown-html" class="markdown-html"></div>
</marked-element>
</section>

Expand Down
6 changes: 3 additions & 3 deletions iron-doc-element.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ <h1>[[title]]</h1>
<a class="name deeplink"
target$="[[_superclassTarget(descriptor.superclass)]]"
href$="[[_superclassUrl(descriptor.superclass)]]">[[descriptor.superclass]]</a>
<span hidden$="[[!descriptor.mixins]]">
with &#8203;<template is="dom-repeat" items="[[descriptor.mixins]]" sort="_compareDescriptors">
<span hidden$="[[!descriptor.mixins]]">&#8203; with &#8203;
<template is="dom-repeat" items="[[descriptor.mixins]]" sort="_compareDescriptors">
<a class="name deeplink mixin" href$="[[baseHref]]/mixins/[[item]]">[[item]]</a>
</template>
</span>
Expand All @@ -66,7 +66,7 @@ <h2>
</h2>

<marked-element sanitize markdown="[[descriptor.description]]">
<div slot="markdown-html"></div>
<div slot="markdown-html" class="markdown-html"></div>
</marked-element>
</section>

Expand Down
8 changes: 4 additions & 4 deletions iron-doc-function.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
}

#paramList marked-element,
#paramList [slot=markdown-html],
#paramList [slot=markdown-html] p {
#paramList .markdown-html,
#paramList .markdown-html p {
display: inline;
}

Expand Down Expand Up @@ -77,7 +77,7 @@
<marked-element
sanitize markdown="[[descriptor.description]]"
hidden$="[[!descriptor.description]]">
<div slot="markdown-html"></div>
<div slot="markdown-html" class="markdown-html"></div>
</marked-element>

<ul id="paramList" hidden$="[[!_showParamList]]">
Expand All @@ -88,7 +88,7 @@
<marked-element
sanitize markdown="[[item.description]]"
hidden$="[[!item.description]]">
<div slot="markdown-html"></div>
<div slot="markdown-html" class="markdown-html"></div>
</marked-element>
</li>
</template>
Expand Down
2 changes: 1 addition & 1 deletion iron-doc-hide-bar.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<a href="" on-tap="_toggle">
<span hidden$="[[visible]]">Show</span>
<span hidden$="[[!visible]]">Hide</span>
<slot></slot>
&#8203;<slot></slot>
</a>

</template>
Expand Down
2 changes: 1 addition & 1 deletion iron-doc-mixin.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h2>
</h2>

<marked-element sanitize markdown="[[descriptor.description]]">
<div slot="markdown-html"></div>
<div slot="markdown-html" class="markdown-html"></div>
</marked-element>
</section>

Expand Down
2 changes: 1 addition & 1 deletion iron-doc-namespace.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h2>
<a href$="#[[fragmentPrefix]]description" class="deeplink">Description</a>
</h2>
<marked-element sanitize markdown="[[descriptor.description]]">
<div slot="markdown-html"></div>
<div slot="markdown-html" class="markdown-html"></div>
</marked-element>
</section>

Expand Down
4 changes: 2 additions & 2 deletions iron-doc-nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ <h3>[[section.heading]]</h3>
},

_isExpanded(item, path) {
return item && path && item.path && item.demos && item.demos.length > 0
&& (path === item.path || path.indexOf(item.path + '/') === 0);
return !!(item && path && item.path && item.demos && item.demos.length > 0
&& (path === item.path || path.indexOf(item.path + '/') === 0));
}
});

Expand Down
2 changes: 1 addition & 1 deletion iron-doc-property.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

<div id="details">
<marked-element sanitize id="desc" markdown="[[descriptor.description]]" hidden$="[[!descriptor.description]]">
<div slot="markdown-html"></div>
<div slot="markdown-html" class="markdown-html"></div>
</marked-element>
</div>
</template>
Expand Down
30 changes: 15 additions & 15 deletions iron-doc-viewer-styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
padding-left: 16px;
}

[slot=markdown-html] pre {
.markdown-html pre {
@apply --iron-doc-font-body;
}

[slot=markdown-html] pre {
.markdown-html pre {
background-color: #f5f5f5;
border-radius: 3px;
font-size: 15px;
Expand All @@ -100,52 +100,52 @@
word-wrap: break-word;
}

[slot=markdown-html] table {
.markdown-html table {
background-color: #f5f5f5;
border-collapse: collapse;
margin: 12px 0;
width: 100%;
}

[slot=markdown-html] tr {
.markdown-html tr {
padding: 0 18px;
}

[slot=markdown-html] td,
[slot=markdown-html] th {
.markdown-html td,
.markdown-html th {
padding: 6px 12px;
}

[slot=markdown-html] td:first-child,
[slot=markdown-html] th:first-child {
.markdown-html td:first-child,
.markdown-html th:first-child {
padding-left: 24px;
}

[slot=markdown-html] td:last-child,
[slot=markdown-html] th:last-child {
.markdown-html td:last-child,
.markdown-html th:last-child {
padding-right: 24px;
}

[slot=markdown-html] td:first-child > code {
.markdown-html td:first-child > code {
color: black;
font-weight: bold;
}

[slot=markdown-html] code {
.markdown-html code {
@apply --iron-doc-font-code;
background-color: #f5f5f5;
padding: 0 5px;
border-radius: 3px;
}

[slot=markdown-html] p {
.markdown-html p {
padding: 0;
}

[slot=markdown-html] a {
.markdown-html a {
@apply --iron-doc-font-body;
background: none;
color: #536dfe;
color: #1565c0;
font-weight: 500;
text-decoration: none;
}
Expand Down

0 comments on commit 61c95d0

Please sign in to comment.