Skip to content

Members #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 10, 2015
Merged

Members #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a4f126
Merge branch 'master' into members
munificent Aug 7, 2015
d8f31fd
Restyle declarations.
munificent Aug 10, 2015
6d9e484
Merge branch 'master' into members
munificent Aug 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions lib/resources/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,15 @@ dt {
}

dd {
margin-bottom: 16px;
color: #727272;
color: #212121;
}

dd.callable, dd.constant, dd.property {
margin-bottom: 24px;
}

dd p {
margin-top: 4px;
}

section.summary h2 {
Expand All @@ -225,6 +232,7 @@ dl.dl-horizontal dt {

dt .name {
font-size: 17px;
font-weight: 500;
}

dl dt.callable .name {
Expand All @@ -236,8 +244,13 @@ dl dt.callable .name {
white-space: nowrap;
}

.signature {
color: #727272;
}

.signature a {
color: rgb(51, 51, 51);
/* 50% mix of default-primary-color and primary-text-color. */
color: #4674a2;
}

.optional {
Expand Down Expand Up @@ -337,9 +350,12 @@ footer .container-fluid {
margin: 0;
}

.is-inherited {
color: #727272;
/* The little slug line under a declaration for things like "const",
"read-only", etc. */
.features {
font-size: 14px;
font-style: italic;
color: #727272;
}

.multi-line-signature {
Expand Down Expand Up @@ -413,10 +429,6 @@ nav .self-name {
font-style: italic;
}

.readable-writable {
font-style: italic;
}

section.multi-line-signature div.parameters {
margin-left: 24px;
}
Expand Down
6 changes: 2 additions & 4 deletions lib/templates/_callable.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
</dt>
<dd>
{{#isInherited}}
<div>
<span class="is-inherited">inherited</span>
</div>
<div class="features">inherited</div>
{{/isInherited}}
{{{ oneLineDoc }}}
<p>{{{ oneLineDoc }}}</p>
</dd>
9 changes: 3 additions & 6 deletions lib/templates/_constant.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<dt id="{{htmlId}}" class="constant">
<span class="top-level-variable-type">{{{ linkedReturnType }}}</span>
<span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{ linkedName }}}</span>
=
<span class="constant-value">{{{ constantValue }}}</span>
<span class="signature">= {{{ constantValue }}}</span>
</dt>
<dd>
<div class="is-const">
const
</div>
{{{ oneLineDoc }}}
<div class="features">const</div>
<p>{{{ oneLineDoc }}}</p>
</dd>
5 changes: 3 additions & 2 deletions lib/templates/_property.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<dt id="{{htmlId}}" class="property">
{{#isInherited}}{{>name_summary}}{{/isInherited}}{{^isInherited}}{{{linkedName}}}{{/isInherited}}
{{#isInherited}}{{>name_summary}}{{/isInherited}}
{{^isInherited}}<span class="name">{{{linkedName}}}</span>{{/isInherited}}
<span class="signature">&#8594; {{{ linkedReturnType }}}</span>
</dt>
<dd>
{{>readable_writable}}
{{{ oneLineDoc }}}
<p>{{{ oneLineDoc }}}</p>
</dd>
4 changes: 2 additions & 2 deletions lib/templates/_readable_writable.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="readable-writable">
{{#readOnly}}read-only{{/readOnly}}{{#writeOnly}}write-only{{/writeOnly}}{{#readWrite}}read / write{{/readWrite}}{{#isInherited}}, <span class="is-inherited">inherited</span>{{/isInherited}}
<div class="features">
{{#readOnly}}read-only{{/readOnly}}{{#writeOnly}}write-only{{/writeOnly}}{{#readWrite}}read / write{{/readWrite}}{{#isInherited}}, inherited{{/isInherited}}
</div>
2 changes: 1 addition & 1 deletion lib/templates/class.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ <h2>Constructors</h2>
const
</div>
{{/isConst}}
{{{ oneLineDoc }}}
<p>{{{ oneLineDoc }}}</p>
</dd>
{{/clazz.constructors}}
</dl>
Expand Down
2 changes: 1 addition & 1 deletion lib/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2>Libraries</h2>
</dt>
<dd>
{{#isNotDocumented}}<span class="undocumented">Library not documented.</span>{{/isNotDocumented}}
{{{ oneLineDoc }}}
<p>{{{ oneLineDoc }}}</p>
</dd>
{{/package.libraries}}
</dl>
Expand Down
6 changes: 3 additions & 3 deletions lib/templates/library.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ <h2>Enums</h2>
{{{linkedName}}}
</dt>
<dd>
{{{ oneLineDoc }}}
<p>{{{ oneLineDoc }}}</p>
</dd>
{{/library.enums}}
</dl>
Expand All @@ -94,7 +94,7 @@ <h2>Classes</h2>
<span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}</span>
</dt>
<dd>
{{{ oneLineDoc }}}
<p>{{{ oneLineDoc }}}</p>
</dd>
{{/library.classes}}
</dl>
Expand All @@ -111,7 +111,7 @@ <h2>Exceptions / Errors</h2>
<span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}</span>
</dt>
<dd>
{{{ oneLineDoc }}}
<p>{{{ oneLineDoc }}}</p>
</dd>
{{/library.exceptions}}
</dl>
Expand Down