Merge pull request #801 from dart-lang/members

Members

Author: sethladd

lib/resources/styles.css

@@ -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 {
@@ -225,6 +232,7 @@ dl.dl-horizontal dt {
 
 dt .name {
   font-size: 17px;
+  font-weight: 500;
 }
 
 dl dt.callable .name {
@@ -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 {
@@ -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 {
@@ -413,10 +429,6 @@ nav .self-name {
   font-style: italic;
 }
 
-.readable-writable {
-  font-style: italic;
-}
-
 section.multi-line-signature div.parameters {
   margin-left: 24px;
 }

lib/templates/_callable.html

@@ -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>

lib/templates/_constant.html

@@ -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>

lib/templates/_property.html

@@ -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>

lib/templates/_readable_writable.html

@@ -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>

lib/templates/class.html

@@ -131,7 +131,7 @@ <h2>Constructors</h2>
                     const
                 </div>
                 {{/isConst}}
-                {{{ oneLineDoc }}}
+                <p>{{{ oneLineDoc }}}</p>
             </dd>
             {{/clazz.constructors}}
         </dl>

lib/templates/index.html

@@ -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>

lib/templates/library.html

@@ -77,7 +77,7 @@ <h2>Enums</h2>
                 {{{linkedName}}}
             </dt>
             <dd>
-                {{{ oneLineDoc }}}
+                <p>{{{ oneLineDoc }}}</p>
             </dd>
             {{/library.enums}}
         </dl>
@@ -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>
@@ -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>