From 95ecae34692aea8e90648c14dad322fa8cd27f0b Mon Sep 17 00:00:00 2001 From: Donna Malayeri Date: Mon, 11 Apr 2011 12:20:07 +0000 Subject: [scaladoc] Improve visual design and layout of ... [scaladoc] Improve visual design and layout of Scaladoc, using contributions from Heather Miller. No review. --- build.xml | 4 +- .../scala/tools/nsc/doc/html/HtmlFactory.scala | 33 +++- .../scala/tools/nsc/doc/html/page/Index.scala | 16 +- .../scala/tools/nsc/doc/html/page/Template.scala | 13 +- .../nsc/doc/html/resource/lib/constructorsbg.gif | Bin 0 -> 1206 bytes .../tools/nsc/doc/html/resource/lib/defbg-blue.gif | Bin 0 -> 1544 bytes .../nsc/doc/html/resource/lib/defbg-green.gif | Bin 0 -> 1341 bytes .../nsc/doc/html/resource/lib/filter_box_left.png | Bin 481 -> 1692 bytes .../nsc/doc/html/resource/lib/filter_box_right.png | Bin 533 -> 1803 bytes .../tools/nsc/doc/html/resource/lib/filterbg.gif | Bin 0 -> 1324 bytes .../nsc/doc/html/resource/lib/filterboxbarbg.gif | Bin 0 -> 1104 bytes .../nsc/doc/html/resource/lib/filterboxbarbg.png | Bin 0 -> 965 bytes .../nsc/doc/html/resource/lib/filterboxbg.gif | Bin 0 -> 1366 bytes .../nsc/doc/html/resource/lib/fullcommenttopbg.gif | Bin 0 -> 1115 bytes .../tools/nsc/doc/html/resource/lib/index.css | 130 ++++++++++++-- .../scala/tools/nsc/doc/html/resource/lib/index.js | 6 + .../nsc/doc/html/resource/lib/navigation-li-a.png | Bin 0 -> 1198 bytes .../nsc/doc/html/resource/lib/navigation-li.png | Bin 0 -> 2441 bytes .../tools/nsc/doc/html/resource/lib/ownderbg2.gif | Bin 0 -> 1145 bytes .../tools/nsc/doc/html/resource/lib/ownerbg.gif | Bin 0 -> 1118 bytes .../tools/nsc/doc/html/resource/lib/ownerbg2.gif | Bin 0 -> 1145 bytes .../tools/nsc/doc/html/resource/lib/packagesbg.gif | Bin 0 -> 1201 bytes .../nsc/doc/html/resource/lib/selected-right.png | Bin 0 -> 1380 bytes .../tools/nsc/doc/html/resource/lib/selected.png | Bin 0 -> 1864 bytes .../nsc/doc/html/resource/lib/selected2-right.png | Bin 0 -> 1434 bytes .../tools/nsc/doc/html/resource/lib/selected2.png | Bin 0 -> 1965 bytes .../nsc/doc/html/resource/lib/signaturebg.gif | Bin 0 -> 1214 bytes .../nsc/doc/html/resource/lib/signaturebg2.gif | Bin 0 -> 1209 bytes .../tools/nsc/doc/html/resource/lib/template.css | 197 ++++++++++++++++++--- .../tools/nsc/doc/html/resource/lib/template.js | 40 ++++- .../tools/nsc/doc/html/resource/lib/typebg.gif | Bin 0 -> 1206 bytes .../tools/nsc/doc/html/resource/lib/unselected.png | Bin 0 -> 1879 bytes .../nsc/doc/html/resource/lib/valuemembersbg.gif | Bin 0 -> 1206 bytes 33 files changed, 373 insertions(+), 66 deletions(-) create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/constructorsbg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/defbg-blue.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/defbg-green.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/filterbg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.png create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/fullcommenttopbg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/navigation-li-a.png create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/navigation-li.png create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/ownderbg2.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/ownerbg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/ownerbg2.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/packagesbg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/selected-right.png create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/selected.png create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/selected2-right.png create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/selected2.png create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/signaturebg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/signaturebg2.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/typebg.gif create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/unselected.png create mode 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/valuemembersbg.gif diff --git a/build.xml b/build.xml index 388ebff4ff..e4a50072ac 100644 --- a/build.xml +++ b/build.xml @@ -375,7 +375,7 @@ LOCAL REFERENCE BUILD (LOCKER) - + @@ -590,6 +590,7 @@ QUICK BUILD (QUICK) + @@ -1101,6 +1102,7 @@ BOOTSTRAPPING BUILD (STRAP) + diff --git a/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala b/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala index f6dc58617e..8d260c2889 100644 --- a/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/html/HtmlFactory.scala @@ -45,11 +45,11 @@ class HtmlFactory(val universe: doc.Universe, index: doc.Index) { copyResource("lib/scheduler.js") copyResource("lib/index.js") copyResource("lib/template.js") + copyResource("lib/index.css") copyResource("lib/ref-index.css") copyResource("lib/template.css") - copyResource("lib/arrow-down.png") - copyResource("lib/arrow-right.png") + copyResource("lib/class.png") copyResource("lib/class_big.png") copyResource("lib/object.png") @@ -58,9 +58,38 @@ class HtmlFactory(val universe: doc.Universe, index: doc.Index) { copyResource("lib/trait_big.png") copyResource("lib/package.png") copyResource("lib/package_big.png") + + copyResource("lib/arrow-down.png") + copyResource("lib/arrow-right.png") copyResource("lib/filter_box_left.png") copyResource("lib/filter_box_right.png") + copyResource("lib/filter_box_left2.gif") + copyResource("lib/filterbg.gif") + copyResource("lib/filterboxbarbg.gif") + copyResource("lib/filterboxbg.gif") + + copyResource("lib/constructorsbg.gif") + copyResource("lib/defbg-blue.gif") + copyResource("lib/defbg-green.gif") + copyResource("lib/fullcommenttopbg.gif") + copyResource("lib/ownderbg2.gif") + copyResource("lib/ownerbg.gif") + copyResource("lib/ownerbg2.gif") + copyResource("lib/signaturebg.gif") + copyResource("lib/signaturebg2.gif") + copyResource("lib/packagesbg.gif") + copyResource("lib/typebg.gif") + copyResource("lib/valuemembersbg.gif") + copyResource("lib/filterboxbarbg.png") + copyResource("lib/remove.png") + copyResource("lib/navigation-li-a.png") + copyResource("lib/navigation-li.png") + copyResource("lib/selected-right.png") + copyResource("lib/selected.png") + copyResource("lib/selected2-right.png") + copyResource("lib/selected2.png") + copyResource("lib/unselected.png") new page.Index(universe, index) writeFor this diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Index.scala b/src/compiler/scala/tools/nsc/doc/html/page/Index.scala index 4295151952..32ba06737b 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Index.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Index.scala @@ -37,10 +37,10 @@ class Index(universe: doc.Universe, index: doc.Index) extends HtmlPage { val body =
- - - - + + + +
{ browser }
@@ -66,14 +66,6 @@ class Index(universe: doc.Universe, index: doc.Index) extends HtmlPage { def browser =
-
{ -
- { for(l <- index.firstLetterIndex.keySet.toList.sortBy( _.toString )) yield { // TODO there should be a better way to do that - val ch = if(l=='#') "%23" else l // url encoding if needed - {l.toUpper} ++ xml.Text(" ") - } } -
- }
{ diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala index cd733ced9a..58ed4961a5 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala @@ -79,20 +79,23 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { { if (tpl.linearizationTemplates.isEmpty) NodeSeq.Empty else
Ordering -
  1. Alphabetic
  2. By inheritance
+
  1. Alphabetic
  2. By inheritance
} { if (tpl.linearizationTemplates.isEmpty) NodeSeq.Empty else
Inherited -
  1. Hide All
  2. Show all
-
    { (tpl :: tpl.linearizationTemplates) map { wte =>
  1. { wte.name }
    2. } }
+
  1. Hide All
    2. +
  2. Show all
+
    { + (tpl :: tpl.linearizationTemplates) map { wte =>
  1. { wte.name }
    2. } + }
} {
Visibility -
  1. Public
  2. All
+
  1. Public
  2. All
}
@@ -197,7 +200,7 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { case dte: DocTemplateEntity if isSelf => // comment of class itself -
{ memberToCommentBodyHtml(mbr, isSelf = true) }
+
{ memberToCommentBodyHtml(mbr, isSelf = true) }
 case dte: DocTemplateEntity if mbr.comment.isDefined => // comment of inner, documented class (only short comment, full comment is on the class' own page) diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/constructorsbg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/constructorsbg.gif new file mode 100644 index 0000000000..2e3f5ea530 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/constructorsbg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/defbg-blue.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/defbg-blue.gif new file mode 100644 index 0000000000..69038337a7 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/defbg-blue.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/defbg-green.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/defbg-green.gif new file mode 100644 index 0000000000..36c43be3a2 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/defbg-green.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/filter_box_left.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filter_box_left.png index 4127dbf3c2..0e8c893315 100644 Binary files a/src/compiler/scala/tools/nsc/doc/html/resource/lib/filter_box_left.png and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filter_box_left.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/filter_box_right.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filter_box_right.png index 942736e44d..f127e35b48 100644 Binary files a/src/compiler/scala/tools/nsc/doc/html/resource/lib/filter_box_right.png and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filter_box_right.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterbg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterbg.gif new file mode 100644 index 0000000000..542ba4aa5a Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterbg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.gif new file mode 100644 index 0000000000..b5075c16cd Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.png new file mode 100644 index 0000000000..d613cf5633 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbarbg.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbg.gif new file mode 100644 index 0000000000..ae2f85823b Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/filterboxbg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/fullcommenttopbg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/fullcommenttopbg.gif new file mode 100644 index 0000000000..a0d93f4844 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/fullcommenttopbg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.css b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.css index 7c05678313..df89781d10 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.css +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.css @@ -2,7 +2,7 @@ color: inherit; font-size: 10pt; text-decoration: none; - font-family: sans-serif; + font-family: Arial; border-width: 0px; padding: 0px; margin: 0px; @@ -20,9 +20,13 @@ h1 { display: none; } -.letters { +/*.letters { + font-family: monospace; + font-size: 2pt; padding: 5px; -} + background-color: #DADADA; + text-shadow: #ffffff 0 1px 0; +}*/ #library { display: none; @@ -40,16 +44,70 @@ h1 { #filter { position: absolute; display: block; - padding: 5px; +/* padding: 5px;*/ right: 0; left: 0; top: 0; - background-color: #DADADA; + background-image:url('filterbg.gif'); + background-repeat:repeat-x; + background-color: #ededee; /* light gray */ + /*background-color: #DADADA;*/ + border:1px solid #bbbbbb; + border-top:0; + border-left:0; + border-right:0; } #textfilter { position: relative; display: block; + height: 20px; + margin-top: 5px; + margin-bottom: 5px; +} + +#textfilter > .pre { + display: block; + position: absolute; + top: 0; + left: 0; + height: 23px; + width: 21px; + background: url("filter_box_left.png"); +} + +#textfilter > .input { + display: block; + position: absolute; + top: 0; + right: 20px; + left: 20px; +} + +#textfilter > .input > input { + height: 21px; + padding: 1px; + font-weight: bold; + color: #000000; + background-color: white; + background: url("filterboxbarbg.png"); + background-repeat:repeat-x; + width: 100%; +} + +#textfilter > .post { + display: block; + position: absolute; + top: 0; + right: 0; + height: 23px; + width: 21px; + background: url("filter_box_right.png"); +} + +/*#textfilter { + position: relative; + display: block; height: 20px; margin-bottom: 5px; } @@ -89,17 +147,20 @@ h1 { height: 20px; width: 20px; background: url("filter_box_right.png"); -} +}*/ #focusfilter { position: relative; + text-align: center; display: block; padding: 5px; - background-color: pink; + background-color: #fffebd; /* light yellow*/ + text-shadow: #ffffff 0 1px 0; } #focusfilter .focuscoll { font-weight: bold; + text-shadow: #ffffff 0 1px 0; } #focusfilter img { @@ -111,14 +172,41 @@ h1 { position: relative; display: block; padding: 5px; - background-color: #999; +/* background-color: #999;*/ text-align: center; } - #kindfilter > a { - color: white; - text-decoration: underline; + color: black; +/* text-decoration: underline;*/ + text-shadow: #ffffff 0 1px 0; + +} + +#kindfilter > a:hover { + color: #4C4C4C; + text-decoration: none; + text-shadow: #ffffff 0 1px 0; + +} + +#letters { + position: relative; + text-align: center; + padding-bottom: 5px; + border:1px solid #bbbbbb; + border-top:0; + border-left:0; + border-right:0; +} + +#letters > a { +/* font-family: monospace;*/ + color: #858484; + font-weight: bold; + font-size: 8pt; + text-shadow: #ffffff 0 1px 0; + padding-right: 2px; } #tpl { @@ -149,23 +237,28 @@ h1 { } #tpl .packages > ol { + background-color: #dadfe6; /*margin-bottom: 5px;*/ } -#tpl .packages > ol > li { +/*#tpl .packages > ol > li { margin-bottom: 1px; -} +}*/ #tpl .packages > li > h3 { display: block; color: white; font-weight: bold; display: block; + text-shadow: #000000 0 1px 0; } #tpl ol > li.pack { - background-color: #2C475C; padding: 3px 5px; + background: url("packagesbg.gif"); + background-repeat:repeat-x; + min-height: 14px; + background-color: #6e808e; } #tpl ol > li { @@ -174,6 +267,7 @@ h1 { #tpl .templates > li { padding-left: 5px; + min-height: 18px; } #tpl ol > li .icon { @@ -217,7 +311,13 @@ h1 { } .ui-layout-resizer { - background: #DDD; + background-image:url('filterbg.gif'); + background-repeat:repeat-x; + background-color: #ededee; /* light gray */ + border:1px solid #bbbbbb; + border-top:0; + border-bottom:0; + border-left: 0; } .ui-layout-toggler { diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js index b06d5dc369..1a574a8752 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js @@ -209,6 +209,7 @@ function prepareEntityList() { function configureTextFilter() { scheduler.add("init", function() { $("#filter").append("
"); + printAlphabet(); var input = $("#textfilter input"); resizeFilterBlock(); input.bind("keyup", function(event) { @@ -391,3 +392,8 @@ function kindFilterSync() { function resizeFilterBlock() { $("#tpl").css("top", $("#filter").outerHeight(true)); } + +function printAlphabet() { + $("#filter").append(""); +} + diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/navigation-li-a.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/navigation-li-a.png new file mode 100644 index 0000000000..9b32288e04 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/navigation-li-a.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/navigation-li.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/navigation-li.png new file mode 100644 index 0000000000..fd0ad06e81 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/navigation-li.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownderbg2.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownderbg2.gif new file mode 100644 index 0000000000..848dd5963a Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownderbg2.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownerbg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownerbg.gif new file mode 100644 index 0000000000..34a04249ee Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownerbg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownerbg2.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownerbg2.gif new file mode 100644 index 0000000000..2ed33b0aa4 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/ownerbg2.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/packagesbg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/packagesbg.gif new file mode 100644 index 0000000000..00c3378a2a Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/packagesbg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected-right.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected-right.png new file mode 100644 index 0000000000..04eda2f307 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected-right.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected.png new file mode 100644 index 0000000000..c89765239e Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected2-right.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected2-right.png new file mode 100644 index 0000000000..bf984ef0ba Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected2-right.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected2.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected2.png new file mode 100644 index 0000000000..a790bb1169 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/selected2.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/signaturebg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/signaturebg.gif new file mode 100644 index 0000000000..b6ac4415e4 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/signaturebg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/signaturebg2.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/signaturebg2.gif new file mode 100644 index 0000000000..9aae5ba0aa Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/signaturebg2.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css index 192a56f9bb..1fb2cbdbc2 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css @@ -30,7 +30,7 @@ input { border-width: 0px; } /* Page */ body { - font-family: sans-serif; + font-family: Arial; font-size: 10pt; } @@ -45,12 +45,23 @@ a[href]:hover { #owner { padding: 2px 10px 5px; + height: 17px; font-size: 12pt; display: block; } #owner a { color: black; +/* text-decoration: none;*/ +/* font-weight: bold;*/ +/* text-shadow: white 0px 1px 0px;*/ +} + +#owner a:hover { + color: black; + text-decoration: none; +/* font-weight: bold;*/ +/* text-shadow: white 0px 1px 0px;*/ } .value #owner { @@ -58,16 +69,23 @@ a[href]:hover { } .type #owner { - background-color: #699D84; /* lighter green */ + background-color: #95b8a1; /* lighter green */ +/* background-image:url('ownerbg2.gif'); + background-repeat:repeat-x;*/ } #types ol li > p { margin-top: 5px; } +#types ol li:last-child { + margin-bottom: 5px; +} + #definition { display: block; padding: 5px 6px; + height: 61px; } #definition > img { @@ -77,19 +95,33 @@ a[href]:hover { #definition > h1 { padding: 12px 0 12px 6px; color: white; + text-shadow: 3px black; + text-shadow: black 0px 2px 0px; font-size: 24pt; display: inline-block; } #definition h1 > a { - color: white; + color: #ffffff; +/* text-decoration: none; */ font-size: 24pt; + text-shadow: black 0px 0px 0px; +} + +#definition h1 > a:hover { + color: #ffffff; + text-decoration: none; + font-size: 24pt; + text-shadow: black 0px 2px 0px; } #signature { - background-color: #EBEBEB; + background-image:url('signaturebg2.gif'); + background-color: #d7d7d7; + min-height: 18px; + background-repeat:repeat-x; font-size: 11.5pt; - margin-bottom: 10px; +/* margin-bottom: 10px;*/ padding: 8px; } @@ -99,12 +131,16 @@ a[href]:hover { text-align: left; width: auto; position: static; + text-shadow: 2px white; + text-shadow: white 0px 1px 0px; } #signature > span.symbol { text-align: left; display: inline; padding-left: 0.7em; + text-shadow: 2px white; + text-shadow: white 0px 1px 0px; } /* Linear super types and known subclasses */ @@ -140,10 +176,14 @@ div.superTypes > h1 { .value #definition { background-color: #2C475C; /* blue */ + background-image:url('defbg-blue.gif'); + background-repeat:repeat-x; } .type #definition { background-color: #316555; /* green */ + background-image:url('defbg-green.gif'); + background-repeat:repeat-x; } #template { @@ -155,6 +195,7 @@ h3 { padding: 5px 10px; font-size: 12pt; font-weight: bold; + text-shadow: black 1px 1px 0px; } dl.attributes > dt { @@ -171,19 +212,41 @@ dl.attributes > dd { #template .values > h3 { background-color: #315479; /* grayish blue */ + background: url("valuemembersbg.gif"); + background-repeat:repeat-x; + height: 28px; +} + +#values ol li:last-child { + margin-bottom: 5px; } #template .types > h3 { background-color: #316555; /* green */ + background: url("typebg.gif"); + background-repeat:repeat-x; + height: 28px; } #constructors > h3 { background-color: #333; + background: url("constructorsbg.gif"); + background-repeat:repeat-x; + height: 28px; } #template > div.parent > h3 { - background-color: #3B3B3B; + background-color: #dadada; +/* border:1px solid #6f6f6f; + border-left:0; + border-right:0;*/ + background: url("constructorsbg.gif"); + background-repeat:repeat-x; + height: 17px; margin-top: 10px; +/* color: black; + text-shadow: white 0px 1px 0px; + font-weight: normal;8*/ font-style: italic; font-size: 12pt; } @@ -229,6 +292,8 @@ div.members > ol > li:last-child { line-height: 18px; clear: both; display: block; + text-shadow: 2px white; + text-shadow: white 0px 1px 0px; } .signature .kind { @@ -405,10 +470,17 @@ p.comment { margin: 5px 10px; } +div.fullcommenttop { + padding: 10px 10px; + background-image:url('fullcommenttopbg.gif'); + background-repeat:repeat-x; +} + div.fullcomment { margin: 5px 10px; } +#template div.fullcommenttop, #template div.fullcomment { display:none; margin: 5px 0 0 8.7em; @@ -425,6 +497,13 @@ div.fullcomment .block { margin-top: 5px; } +div.fullcommenttop .block { + padding: 5px 0 0; + border-top: 1px solid #EBEBEB; + margin-top: 5px; + margin-bottom: 5px +} + div.fullcomment div.block ol li p, div.fullcomment div.block ol li { display:inline @@ -440,16 +519,20 @@ div.fullcomment .comment { margin: 5px 0 10px; } +div.fullcommenttop .comment:last-child, div.fullcomment .comment:last-child { margin-bottom: 0; } + +div.fullcommenttop dl.paramcmts > dt, div.fullcomment dl.paramcmts > dt { display: block; float: left; font-weight: bold; } +div.fullcommenttop dl.paramcmts > dd, div.fullcomment dl.paramcmts > dd { display: block; padding-left: 80px; @@ -470,8 +553,8 @@ div.fullcomment dl.paramcmts > dd { position: absolute; top: 0; left: 0; - height: 20px; - width: 20px; + height: 23px; + width: 21px; background: url("filter_box_left.png"); } @@ -484,12 +567,14 @@ div.fullcomment dl.paramcmts > dd { } #textfilter > .input > input { - height: 16px; - padding: 2px; - font-weight: bold; - color: #993300; + height: 21px; + padding: 1px; + font-weight: bold; + color: #000000; background-color: white; - width: 100%; + background: url("filterboxbarbg.png"); + background-repeat:repeat-x; + width: 100%; } #textfilter > .post { @@ -497,14 +582,16 @@ div.fullcomment dl.paramcmts > dd { position: absolute; top: 0; right: 0; - height: 20px; - width: 20px; + height: 23px; + width: 21px; background: url("filter_box_right.png"); } #mbrsel { padding: 5px 10px; - background-color: #DADADA; /* light gray */ + background-color: #ededee; /* light gray */ + background-image:url('filterboxbg.gif'); + background-repeat:repeat-x; font-size: 9.5pt; display: block; margin-top: 1em; @@ -520,47 +607,103 @@ div.fullcomment dl.paramcmts > dd { } #mbrsel > div > span.filtertype { - padding: 3px 0; + padding: 4px; + margin-right: 5px; float: left; display: inline-block; - color: #404040; + color: #000000; + font-weight: bold; + text-shadow: white 0px 1px 0px; width: 4.5em; } #mbrsel > div > ol { display: inline-block; - /*background-color: white;*/ } #mbrsel > div > ol#linearization { - display: block; - margin-left: 4.5em; - margin-top: 5px; + display: table; + margin-left: 70px; +} + +#mbrsel > div > ol#linearization > li.in { + text-decoration: none; + float: left; + padding-right: 10px; + margin-right: 5px; + background: url(selected-right.png) no-repeat; + background-position: right 0px; +} + +#mbrsel > div > ol#linearization > li.in > span{ + color: #4C4C4C; + float: left; + padding: 1px 0 1px 10px; + background: url(selected.png) no-repeat; + background-position: 0px 0px; + text-shadow: #ffffff 0 1px 0; } #mbrsel > div > ol > li { - padding: 3px 10px; - background-color: white; +/* padding: 3px 10px;*/ + line-height: 16pt; display: inline-block; cursor: pointer; } #mbrsel > div > ol > li.in { - background-color: white; + text-decoration: none; + float: left; + padding-right: 10px; + margin-right: 5px; + background: url(selected-right.png) no-repeat; + background-position: right 0px; +} + +#mbrsel > div > ol > li.in > span{ color: #4C4C4C; + float: left; + padding: 1px 0 1px 10px; + background: url(selected.png) no-repeat; + background-position: 0px 0px; + text-shadow: #ffffff 0 1px 0; } #mbrsel > div > ol > li.out { - color: #4B4B4B; - background-color: #999; + text-decoration: none; + float: left; + padding-right: 10px; + margin-right: 5px; } +#mbrsel > div > ol > li.out > span{ + color: #4B4B4B; +/* background-color: #999; */ + float: left; + padding: 1px 0 1px 10px; +/* background: url(unselected.png) no-repeat;*/ + background-position: 0px -1px; + text-shadow: #ffffff 0 1px 0; +} +/* #mbrsel .hideall { + color: #4C4C4C; + line-height: 16px; + font-weight: bold; +} + +#mbrsel .hideall span { color: #4C4C4C; font-weight: bold; } #mbrsel .showall { color: #4C4C4C; + line-height: 16px; font-weight: bold; } + +#mbrsel .showall span { + color: #4C4C4C; + font-weight: bold; +}*/ \ No newline at end of file diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js index 14a5613015..e848078aca 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js @@ -42,6 +42,8 @@ $(document).ready(function(){ }; filter(); }); + +/* $("#ancestors > ol > li.hideall").click(function() { $("#linearization li.in").removeClass("in").addClass("out"); $("#linearization li:first").removeClass("out").addClass("in"); @@ -55,6 +57,32 @@ $(document).ready(function(){ filtered.removeClass("out").addClass("in"); filter(); }); +*/ + + + $("#ancestors > ol > li.hideall").click(function() { + if ($(this).hasClass("out")) { + $(this).removeClass("out").addClass("in"); + $("#ancestors > ol > li.showall").removeClass("in").addClass("out"); + $("#linearization li.in").removeClass("in").addClass("out"); + $("#linearization li:first").removeClass("out").addClass("in"); + filter(); + }; + }) + $("#ancestors > ol > li.showall").click(function() { + if($(this).hasClass("out")){ + $(this).removeClass("out").addClass("in"); + $("#ancestors > ol > li.hideall").removeClass("in").addClass("out"); + var filtered = + $("#linearization li.out").filter(function() { + return ! isHiddenClass($(this).attr("name")); + }); + filtered.removeClass("out").addClass("in"); + filter(); + }; + }); + + $("#visbl > ol > li.public").click(function() { if ($(this).hasClass("out")) { $(this).removeClass("out").addClass("in"); @@ -112,12 +140,16 @@ $(document).ready(function(){ var vis = $(":visible", fullComment); signature.toggleClass("closed").toggleClass("opened"); if (vis.length > 0) { - shortComment.slideDown(100); - fullComment.slideUp(100); + shortComment.slideDown(50); + fullComment.slideUp(50); + signature.addClass("closed"); + signature.removeClass("opened"); } else { - shortComment.slideUp(100); - fullComment.slideDown(100); + shortComment.slideUp(50); + fullComment.slideDown(50); + signature.removeClass("closed"); + signature.addClass("opened"); } }; docAllSigs.addClass("closed"); diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/typebg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/typebg.gif new file mode 100644 index 0000000000..2fcc77b2e8 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/typebg.gif differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/unselected.png b/src/compiler/scala/tools/nsc/doc/html/resource/lib/unselected.png new file mode 100644 index 0000000000..d5ac639405 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/unselected.png differ diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/valuemembersbg.gif b/src/compiler/scala/tools/nsc/doc/html/resource/lib/valuemembersbg.gif new file mode 100644 index 0000000000..2a949311d7 Binary files /dev/null and b/src/compiler/scala/tools/nsc/doc/html/resource/lib/valuemembersbg.gif differ -- cgit v1.2.3