lighter presentation, version bump

shenanigans · Jan 14, 2015 · d06dc32 · d06dc32
1 parent 7e960c2
commit d06dc32
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 33 deletions.
diff --git a/indexFiles/index.css b/indexFiles/index.css
@@ -22,6 +22,7 @@ body.spare .markdown {
 
 #outer {
     min-height: 100%;
+    min-width: 65em;
 }
 
 a {
@@ -46,7 +47,8 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 #content {
-    min-width: 33em;
+    min-width: 26em;
+    max-width: 42em;
     padding: 0 2em 3em 2em;
     display: inline-block;
     text-align: left;
@@ -202,15 +204,18 @@ p {
 .valsep:last-child {
     display: none;
 }
-
+.punctuation {
+    color: #E837D2;
+    font-weight: 300;
+}
 .signature {
     color: #C813B1;
     font-weight: 700;
     margin: 0;
     padding-left: 0.3em;
 }
-.child .signature {
-    font-size: 110%;
+.child > .signature {
+    font-size: 120%;
 }
 .child .child .signature {
     font-size: inherit;
@@ -220,11 +225,27 @@ p {
 }
 .signature .argument {
     display: inline-block;
+    /*margin-left: 2em;*/
+    font-size: 90%;
+}
+.child .argument > .title {
+    font-weight: 300;
+    font-size: 110%
+}
+h1.signature .argument {
+    display: block;
+    margin-left: 1em;
+    font-size: 80%;
 }
 h1.signature {
     margin-top: 0.7em;
 }
 
+.optionBracket {
+    color: #FA8CEC;
+    font-weight: 300;
+}
+
 .star {
     font-size: 130%;
     line-height: 0.1em;
@@ -243,7 +264,7 @@ h1.signature {
     line-height: 0.1em;
 }
 /* hide comma after final argument */
-*:first-child > .comma {
+*:first-of-type > .comma {
     display: none;
 }
 
@@ -350,3 +371,7 @@ h1.signature {
     margin-left: -0.5em;
     padding-left: 2em;
 }
+
+h1 .types {
+    font-size: 80%;
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doczar",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A highly flexible comments-only documentation generator.",
   "keywords": [
     "documentation",

diff --git a/templates/argument.bars b/templates/argument.bars
@@ -1,41 +1,41 @@
 <div class="argument">
     <span class="comma">,</span>
-    {{#if isOptional}}[{{/if}}
+    {{#if isOptional}}<span class="optionBracket">[</span>{{/if}}
     {{#if isKwarg}}
         <a class="title" href="{{softlink path}}">
             {{name}}
         </a>
-        =
+        <span class="punctuation">=</span>
         <span>{{#valtype}}
-            <span class="valsep">|</span>
+            <span class="valsep punctuation">|</span>
             <a class="valtype" href="{{link path}}">{{name}}</a>
             {{#if isArray}}[ ]{{/if}}
             {{#if generics}}
-                [
+                <span class="punctuation">[</span>
                 <span>{{#generics}}
                     <a class="valtype" href="{{link path}}">{{name}}</a>
-                    <span class="valsep">,</span>
+                    <span class="valsep punctuation">,</span>
                 {{/generics}}</span>
-                ]
+                <span class="punctuation">]</span>
             {{/if}}
         {{/valtype}}</span>
     {{else}}
         <span>{{#valtype}}
-            <span class="valsep">|</span>
+            <span class="valsep punctuation">|</span>
             <a class="valtype" href="{{link path}}">{{name}}</a>{{#if isPointer}}<span class="star">*</span>{{/if}}
             {{#if isArray}}[ ]{{/if}}
             {{#if generics}}
-                [
+                <span class="punctuation">[</span>
                 <span>{{#generics}}
                     <a class="valtype" href="{{link path}}">{{name}}</a>
-                    <span class="valsep">,</span>
+                    <span class="valsep punctuation">,</span>
                 {{/generics}}</span>
-                ]
+                <span class="punctuation">]</span>
             {{/if}}
         {{/valtype}}</span>
         <a class="title" href="{{softlink path}}">
             {{name}}
         </a>
     {{/if}}
-    {{#if isOptional}}]{{/if}}
+    {{#if isOptional}}<span class="optionBracket">]</span>{{/if}}
 </div>
diff --git a/templates/argumentSignature.bars b/templates/argumentSignature.bars
@@ -6,38 +6,38 @@
     <span class="ctype">callback</span>
     {{/unless}}{{/if}}
     {{#if isKwarg}}
-        <a class="title" href="{{link path}}">
+        <a class="name" href="{{link path}}">
             {{name}}
         </a>
-        =
+        <span class="punctuation">=</span>
         <span>{{#valtype}}
-            <span class="valsep">|</span>
+            <span class="valsep punctuation">|</span>
             <a class="valtype" href="{{link path}}">{{name}}</a>
             {{#if isArray}}[ ]{{/if}}
             {{#if generics}}
-                [
+                <span class="punctuation">[</span>
                 <span>{{#generics}}
                     <a class="valtype" href="{{softlink path}}">{{name}}</a>
-                    <span class="valsep">,</span>
+                    <span class="valsep punctuation">,</span>
                 {{/generics}}</span>
-                ]
+                <span class="punctuation">]</span>
             {{/if}}
         {{/valtype}}</span>
     {{else}}
         <span>{{#valtype}}
-            <span class="valsep">|</span>
+            <span class="valsep punctuation punctuation">|</span>
             <a class="valtype" href="{{link path}}">{{name}}</a>{{#if isPointer}}<span class="star">*</span>{{/if}}
             {{#if isArray}}[ ]{{/if}}
             {{#if generics}}
-                [
+                <span class="punctuation">[</span>
                 <span>{{#generics}}
                     <a class="valtype" href="{{link path}}">{{name}}</a>
-                    <span class="valsep">,</span>
+                    <span class="valsep punctuation">,</span>
                 {{/generics}}</span>
-                ]
+                <span class="punctuation">]</span>
             {{/if}}
         {{/valtype}}</span>
-        <a class="title" href="{{link path}}">
+        <a class="name" href="{{link path}}">
             {{name}}
         </a>
     {{/if}}

diff --git a/templates/function.bars b/templates/function.bars
@@ -6,16 +6,16 @@
         {{#if returns}}
             <span>{{#returns}}
                 <span class="valsep">,</span>
-                <span>{{#valtype}}
-                    <span class="valsep">|</span>
+                <span class="types">{{#valtype}}
+                    <span class="valsep punctuation">|</span>
                     <a class="valtype" href="{{link path}}">{{name}}</a>{{#if isPointer}}<span class="star">*</span>{{/if}}
                     {{#if generics}}
-                        [
+                        <span class="punctuation">[</span>
                         <span>{{#generics}}
                             <a class="valtype" href="{{link path}}">{{name}}</a>
                             <span class="valsep">,</span>
                         {{/generics}}</span>
-                        ]
+                        <span class="punctuation">]</span>
                     {{/if}}
                 {{/valtype}}</span>
             {{/returns}}</span>
@@ -25,7 +25,7 @@
         </a>
         (
             <span>{{#arguments}}
-{{> argument}}
+{{> lightArgument}}
             {{/arguments}}</span>
         ) {
     </span>

diff --git a/templates/header.bars b/templates/header.bars
@@ -53,6 +53,23 @@
         <div id="content">
             {{#if isFunction}}
                 <h1 class="signature">
+                    {{#if returns}}
+                        <span>{{#returns}}
+                            <span class="valsep">,</span>
+                            <span class="types">{{#valtype}}
+                                <span class="valsep punctuation">|</span>
+                                <a class="valtype" href="{{link path}}">{{name}}</a>{{#if isPointer}}<span class="star">*</span>{{/if}}
+                                {{#if generics}}
+                                    <span class="punctuation">[</span>
+                                    <span>{{#generics}}
+                                        <a class="valtype" href="{{link path}}">{{name}}</a>
+                                        <span class="valsep">,</span>
+                                    {{/generics}}</span>
+                                    <span class="punctuation">]</span>
+                                {{/if}}
+                            {{/valtype}}</span>
+                        {{/returns}}</span>
+                    {{/if}}
                     {{name}} (
                         {{#arguments}}
 {{> argument}}

diff --git a/templates/lightArgument.bars b/templates/lightArgument.bars
@@ -0,0 +1,23 @@
+<div class="argument">
+    <span class="comma">,</span>
+    {{#if isOptional}}<span class="optionBracket">[</span>{{/if}}
+    {{#if isKwarg}}
+        <a class="title" href="{{softlink path}}">
+            {{name}}
+        </a>
+        <span class="punctuation">=</span>
+        <span>{{#valtype}}
+            <span class="valsep punctuation">|</span>
+            <a class="valtype" href="{{link path}}">{{name}}</a>
+            {{#if isArray}}
+                <span class="punctuation">[</span>
+                <span class="punctuation">]</span>
+            {{/if}}
+        {{/valtype}}</span>
+    {{else}}
+        <a class="title" href="{{softlink path}}">
+            {{name}}
+        </a>
+    {{/if}}
+    {{#if isOptional}}<span class="optionBracket">]</span>{{/if}}
+</div>