Changeset 33915 in project


Ignore:
Timestamp:
04/01/17 20:08:49 (9 months ago)
Author:
zbigniew
Message:

chickadee 0.11.0: Declutter appearance; link and style plaintext id/args with new chicken-doc-html

Location:
release/4/chickadee/trunk
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed
  • release/4/chickadee/trunk/chickadee.css

    r26104 r33915  
    1111
    1212ul, ol { margin: 1em 0; padding: 0 0 0 40px; } /* fix IE 6,7 bullets */
    13 pre, code, kbd, samp, tt {
    14  font-family: monospace, monospace;
    15  _font-family: 'courier new', monospace;
     13pre {
     14 /* font-family: monospace, monospace;  */
     15 font-family: 'menlo', 'lucida sans typewriter', 'andale mono', 'courier', 'courier new', monospace;
    1616 font-size: 0.875em;
    17 }
     17 /* letter-spacing: -1px; */ /* this only looks good with andale mono */
     18 /* ios: american typewriter, americantypewriter-condensed, couriernew, menlo */
     19 /* menlo & lucida sans are very close, but they're also tall, so they don't look great in tt */
     20}
     21
     22code, kbd, samp, tt {
     23 font-size: 0.875em;    /* courier needs 1.0em for proper x-height, but menlo/lucida sans are good (though M-height is too small) */
     24 /*letter-spacing: -1px;*/
     25 font-family: 'menlo', 'lucida sans typewriter', 'andale mono', 'courier', 'courier new', monospace;
     26}
     27
    1828
    1929pre {
    2030  padding: 0.2em 0 0.2em 1em;
    21   margin: 1em 0 1em 0.3em;
    22   border-left: 3px double black;
     31  margin: 1em 0 1em 1.0em;
     32  border-left: 1px solid #888;
     33  line-height: 1.33em;
    2334/*  background-color: #f4f4f4; */
    2435}
     
    3243#main ul {
    3344  list-style-type: circle;
     45}
     46#main p {
     47    line-height: 1.33em;
    3448}
    3549
     
    112126}
    113127#toc ul.toc {
    114   padding-left: 0.5em;
     128    padding: 0.3em 0.5em;
    115129}
    116130#toc ul li {
     
    127141
    128142dl.defsig {
    129   border: 1px solid black;
    130   border-left: 3px solid black;
    131 /*  border-right: 3px double black; */
    132   border-color: black;
    133   margin-left: 1em;
    134 /*  margin-right: 1em; */
    135   -moz-border-radius-bottomright: 5px;
    136   -webkit-border-bottom-right-radius: 5px;
    137   border-bottom-right-radius: 5px;
    138 /*  -webkit-box-shadow: #bbb 0px 1px 1px;
    139   -moz-box-shadow: #bbb 0px 2px 5px;
    140   box-shadow: #bbb 0px 2px 5px; */
     143  margin-top: 2em;
     144  margin-bottom: 2em;
     145  margin-left: 2em;
     146  margin-right: 2em;
    141147}
    142148
    143149dt.defsig {
    144   padding: 0.2em 1.0em;
    145   background-color: #444;
    146   color: #fff;
    147   border-bottom: 1px solid black;
     150  padding: 0.2em 0.0em;
     151  /* background-color: #444; */
     152  color: #000;
     153  /* border-bottom: 1px solid black; */
    148154  font-weight: normal;
    149155  margin: 0;
     
    163169  /* color: inherit !important; */
    164170  font-style: normal; 
    165   color: #fff;
     171  /* font-weight: bold; */
     172  color: #000;
    166173}
    167174dt.defsig a:hover tt {
    168   border-bottom: 1px solid #fff !important;
    169 }
     175  border-bottom: 1px solid #000 !important;
     176}
     177dt.defsig a:hover var.id {
     178  border-bottom: 1px solid #000 !important;  /* should this be reverse video? */
     179}
     180#main var a {
     181    text-decoration: none;
     182    border-bottom: none;
     183}
     184/*#main dd.defsig var a:hover {
     185  border-bottom: 1px solid #000 !important;
     186}*/
    170187
    171188dt.defsig span.type {
    172189  float: right;
    173   color: #eee;
    174   font-size: 0.9375em;
     190  color: #000;
     191  /* font-size: 0.9375em; */
    175192  font-style: italic;
    176193  font-weight: normal;
     
    180197/* monospace already set via tt */
    181198  float: left;
    182 }
     199  font-weight: bold;
     200}
     201dt.defsig span.sig tt {
     202  /* font-family: inherit; */
     203  /* font-size: .9375em; */    /* Sometimes looks slightly better slightly bigger */
     204}
     205dl.defsig var.arg {
     206    font-weight: normal;
     207    font-style: italic;
     208    text-transform: lowercase;
     209}
     210var.id {
     211    font-style: italic; /* looks better than normal */
     212    font-weight: bold;
     213}
     214dl.defsig var.dsssl {
     215    font-style: normal;
     216    font-weight: bold;
     217    color: #666;
     218}
     219dl.defsig var.value {
     220    font-family: monospace;
     221    font-style: normal;
     222    font-weight: normal;
     223}
     224
    183225
    184226/* dt.defsig span.sig tt {
     
    196238   if margin & padding is 0, then tables are not offset */
    197239dd.defsig {
    198   padding-left: 1em;
    199   padding-right: 1em;
    200   margin: 0;
    201   margin-top: 1em;
    202   margin-bottom: 1em;
     240  padding-left: 1.5em;
     241  padding-right: 0em;
     242  margin: 0;
    203243  background-color: #ffffff;
    204244}
     
    207247/*  border-top: 1px solid black; */
    208248  border-bottom: 3px double black;
     249  font-size: 1.4em;
     250  margin-top: 1.5em;
    209251}
    210252
    211253h3 {
    212254  border-bottom: 1px solid #808080;
    213 }
     255  font-size: 1.4em;
     256  margin-top: 1.5em;
     257}
     258
     259h4 {
     260  font-size: 1.25em;
     261}
     262
     263h5 {
     264  font-size: 1.10em;
     265}
     266h6 {
     267  font-size: 1em;
     268}
     269
    214270
    215271/* section links */
     
    229285
    230286table {
    231   border: 1px solid black;
     287  /* border: 1px solid black; */
    232288  border-collapse: collapse;
    233289/*  margin-left: auto;
     
    236292  margin-left: 2em;
    237293  margin-right: 2em;
    238   margin-top: 0;
    239   margin-bottom: 0;
     294  margin-top: 1.5em;
     295  margin-bottom: 1.5em;
    240296}
    241297th {
    242298  text-align: left;
    243   padding-left: 1em;
    244   padding-right: 1em;
     299  padding: 0.3em 1em;
    245300  font-weight: bold;
    246   border: 1px solid black;
     301  /* border: 1px solid black; */
     302  border-bottom: 1px solid black;
    247303}
    248304td {
    249   border: 1px solid black;
    250   padding-left: 1em;
    251   padding-right: 1em;
     305  /* border: 1px solid black; */
     306  padding: 0.3em 1em;
     307}
     308tr:hover {
     309    background-color: #eee;
    252310}
    253311dl {
    254312  margin-left: 1em;
     313  margin-right: 1em;
    255314}
    256315dt {
     
    665724        *width: 33%;
    666725    }
    667     #hdr-lookup {
    668         border-top: 1px solid black;   /* stupid hack */
    669     }
     726    /* #hdr-lookup {
     727        border-top: 1px solid black;
     728    }*/
    670729    #searchbox {
    671730        width: 75%;
    672731    }
    673732    div.buttons { width: 5em; font-size: 0.875em; }
    674     dt.defsig { font-size: 0.875em; }
    675     dl.defsig span.sig tt { font-size: inherit; }
    676     dl.defsig { margin-left: 0; }
     733    /* dt.defsig { font-size: 0.875em; } */
     734    /* dl.defsig span.sig tt { font-size: inherit; } */
     735    dl.defsig { margin: 1em 0; }
    677736    pre { margin-right: 0;
    678737          margin-left: -0.75em;
     
    680739          border-left-color: #666;  /* claustrophobia */
    681740          -webkit-box-sizing: border-box;
    682           letter-spacing: -1px;     /* Important for <=480px, but may be too squished for 600px */
     741          /* letter-spacing: -1px; */    /* Important for <=480px, but may be too squished for 600px */
     742          line-height: 1.2em;
    683743    }
    684744    table { margin-left: 0; margin-right: 0; }
     745    td, th { padding: 0.2em 0.5em; }
     746    #main p {
     747        line-height: 1.2em;
     748    }
     749    #main { padding: 0 8px; font-size: 0.9375em; }
     750    dt.defsig span.type {   /* hack to keep it visually distinguishable from args when tightly packed */
     751        color: #888;
     752        font-style: normal;
     753    }
    685754}
    686755
     
    701770        min-height: 2em;
    702771    }
    703     h3 { font-size: 1em; }   /* useful, but what about h4-h6? */
     772    /* h3 { font-size: 1em; } */  /* useful, but what about h4-h6? */
    704773    #hdr h1 { font-size: 0.875em; }
    705774    div.buttons { width: 5em; font-size: 0.750em; }
    706     dt.defsig { font-size: 0.825em; padding: 0.2em 0.5em; }
     775    /*dl.defsig { font-size: 0.9375em; }*/
     776    dt.defsig { padding: 0.2em 0.5em; }
    707777    dd.defsig { padding: 0 0.5em; }
    708     #main { padding: 0 8px; }
     778    #main { padding: 0 8px; font-size: 0.9375em; }
    709779    #hdr-lookup { margin-right: 8px; }
     780    #hdr-searchbox { width: 10em; }
    710781    #contents { margin-left: 8px; margin-right: 8px; }
    711782    /* Left margin is narrower, so modify pre extending into margin */
     
    713784          border-left-width: 1px;
    714785          padding-left: 0.25em;
    715           letter-spacing: -1px;
    716           font-size: 0.75em;
    717    }
     786          /* letter-spacing: -1px; */
     787          font-size: 0.8em;
     788          line-height: 1.2em;
     789    }
     790    /* tt { letter-spacing: -1px; } */
     791    ul, ol { padding: 0 0 0 30px; }
     792    dd { margin: 0 0 0 1em; }
    718793}
    719794
  • release/4/chickadee/trunk/chickadee.meta

    r27117 r33915  
    1111        (chicken-doc 0.4.4)
    1212        sxml-transforms uri-generic (chicken-doc-admin 0.4.0)
    13         (chicken-doc-html 0.2.5))
     13        (chicken-doc-html 0.3.0))
    1414 (files "chickadee-cmd.scm" "chickadee-config.scm" "chickadee-driver-3e8.scm" "chickadee.setup" "chickadee.release-info" "jquery.metadata.min.js" "chickadee.meta" "mag.png" "chickadee.js" "chickadee.scm" "chickadee-config-nginx.scm" "install.sh" "chickadee-jquery.js" "chickadee.css" "chickadee-driver.scm"))
  • release/4/chickadee/trunk/chickadee.scm

    r29320 r33915  
    241241;; for ID suitable for placement in a defsig in N.  That is, it will refer
    242242;; to the actual child node when N is an egg (etc.) and it will refer to
    243 ;; an anchor id in the parent when N is itself a defsig.
     243;; an anchor id in the parent when N is itself a defsig.
     244;; Returns #f if the ID is not a definition inside N. This is useful when
     245;; conditionally lighting up plaintext IDs as definition links. But when N
     246;; is a defsig, it does not check the parent.
     247
    244248(define (make-def->href n)
    245249  (let ((doc (node-sxml n))
     
    249253               (href (path->href path)))
    250254          (lambda (id)
    251             (string-append href "#" (quote-identifier (definition->identifier id)))))
     255            (and (or (string=? (->string id)
     256                               (->string (node-id n))) ; Make sure to recognize ourselves!
     257                     (node-definition-id? n id)) ; Note: Does not look in parent. Possible fixme.
     258                 (string-append href "#" (quote-identifier (definition->identifier id))))))
    252259        (lambda (id)
    253           (path->href (append path (list id)))))))
     260          (and (node-definition-id? n id)
     261               (path->href (append path (list id))))))))
    254262
    255263(define (title-path n)
     
    326334        (li "Regular expression matching is usually done against node names,"
    327335            " but if a space is present, the full node path will be considered."))
    328     (h3 "Quick links")
     336    (h4 "Quick links")
    329337    (ul (li ,(path-link '(chicken) "Chicken manual"))
    330338        (li ,(path-link '(chicken language) "Supported language"))
     
    332340    (h4 "About")
    333341    (p ,(path-link '(chickadee))
    334        " is the web interface to the "
     342       " is an interface to the "
    335343       ,(path-link '(chicken-doc))
    336        " documentation system for the "
    337        (a (@ (href "http://call-cc.org")) "Chicken")
    338        " language.  It is running on the "
    339        ,(path-link '(spiffy))
    340        " webserver on Chicken " ,(chicken-version) ".")))
     344       " documentation system for "
     345       (a (@ (href "http://call-cc.org")) (span (@ (style "font-variant: small-caps")) "Chicken") " Scheme")
     346       ".")))
    341347
    342348;; Conditionally add Internet Explorer classes to <html> a la HTML5 Boilerplate.
     
    383389            (h1 ,(path-link '() "chickadee")
    384390                ,(if (null? title)
    385                      `((" | " ,(path-link '(chicken-doc))
    386                         " server"))
     391                     `(;; (" | " ,(path-link '(chicken-doc)) " " "server"
     392                        )
    387393                     `((lit " &raquo; ") ,title)))
    388394            (h5 (label (@ (for "hdr-searchbox"))
  • release/4/chickadee/trunk/chickadee.setup

    r29320 r33915  
    11;; -*- scheme -*-
    22
    3 (define +version+ "0.10.3")
     3(define +version+ "0.11.0")
    44
    55(compile -s -O2 -d1 -S chickadee.scm -j chickadee)
Note: See TracChangeset for help on using the changeset viewer.