From c9594f6dace33a8c12e044117203f5b9fb714025 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Tue, 2 Aug 2011 01:50:38 +0000 Subject: [PATCH] Updated overloaded doc template to match module. Include individual ssorgsite css files rather than requiring the min version in devmode git-svn-id: http://svn.silverstripe.com/projects/ss2doc/branches/v2@120544 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- themes/docs/css/DocumentationViewer.css | 126 +++--------------- themes/docs/templates/DocumentationViewer.ss | 23 +++- .../templates/Layout/DocumentationViewer.ss | 4 +- themes/docs/templates/Layout/Page.ss | 2 +- 4 files changed, 39 insertions(+), 116 deletions(-) diff --git a/themes/docs/css/DocumentationViewer.css b/themes/docs/css/DocumentationViewer.css index 0a94d3b..57aa7ef 100644 --- a/themes/docs/css/DocumentationViewer.css +++ b/themes/docs/css/DocumentationViewer.css @@ -1,22 +1,9 @@ /** - * Documentation Viewer Styles. Uses the base styles from ss.screen.min.css - * - * @author Will Rossiter + * Documentation Viewer Styles. U */ -a { color: #0973A6; text-decoration: none; } - a:hover, - a:focus { text-decoration: underline;} - -p { font-size: 12px; line-height: 16px; margin-bottom: 16px; } -/* p { font-size: 14px; line-height: 22px; margin-bottom: 22px; } */ - - - #Form_LanguageForm { margin-top: 16px; } -.clear { clear: both; } - /* Language Bar */ #language { position: absolute; top: 57px; right: 30px; width: 185px; display: none; /* not useful yet */} @@ -24,106 +11,33 @@ p { font-size: 12px; line-height: 16px; margin-bottom: 16px; } #language select { float: right; width: 120px;} #language input.action { float: right; margin-top: 4px;} -/* Footer */ - -/* Content */ -.typography h1+p { font-size: 18px; line-height: 24px; } -/* documentation navigation */ -.documentation-nav { - clear: both; - margin: 0 0 5px; - overflow: hidden; color: #999999; - font-size: 11px; -} - .documentation-nav h2 { font-size: 11px; font-weight: normal; float: left; margin-right: 5px;} - .documentation-nav ul { margin: 0; padding: 0; float: left;} - .documentation-nav li { display: inline; list-style: none; padding: 0; margin: 0; font-size: 11px; } - .documentation-nav li a { margin-left: 5px; padding: 0px; } - .documentation-nav li a.current { - background: #0973A6; color: #fff; font-weight: bold; - padding: 4px; - -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; - } - .documentation-nav li a.current:hover, - .documentation-nav li a.current:focus { - text-decoration: none; - } - -#left-column { width: 640px; float: left; } - -#right-column { - width: 250px; - float: right; -} - - #right-column .box { - margin: 0 12px 12px 0; +/* Nested tree */ +.box ul.tree {} + .box ul.tree li { + list-style: none; } - - /* Nested tree */ - .box ul.tree {} - .box ul.tree li { - list-style: none; + .box ul.tree li.folder { + background: #d5eefd; + font-size: 12px; + color: #29688c; + margin-bottom: 7px; + border: 1px solid #d5eefd; + padding: 2px 6px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } - .box ul.tree li.folder { - background: #d5eefd; - font-size: 12px; - color: #29688c; - margin-bottom: 9px; - border: 1px solid #d5eefd; - padding: 2px 6px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - } + .undocumented-modules { clear: both; - padding-top: 10px; + padding-top: 9px; font-style: italic; } -.module { margin: 10px -; } +.module { margin: 9px; } -/* Comments */ -#comments { - clear: both; - padding-top: 20px; -} +/* Content */ +.typography h1+p { font-size: 18px; line-height: 24px; } - #comments .notice { - font-size: 12px; - } - -/* Links to API */ -#left-column a[href^="http://api."] { - padding: 2px; - font-family: Monaco, 'Bitstream Vera Sans Mono', Courier, monospace; - background: url(../../ssorgsites/images/external_link.png) no-repeat right 3px; - padding-right: 14px; -} -/** - * TOC - */ - -.sidebar-box { - margin: 0 0 11px 0; - padding: 11px 15px; - background: #f4f4f4; - width: 220px; - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; -} - .sidebar-box ul { margin: 0; padding: 0;} - .sidebar-box h4 { font-size: 12px; margin-bottom: 11px;} - .sidebar-box ul li { list-style: none; } - .sidebar-box ul li .current { font-weight: bold;} - .sidebar-box ul li.h1 { margin-top: 11px; font-weight: bold;} - .sidebar-box ul li.h2, - .sidebar-box ul ul { margin-top: 8px;} - .sidebar-box ul li li { font-size: 11px; } - .sidebar-box ul li.h3, - .sidebar-box ul li li li { margin-left: 20px; font-size: 11px; margin-left: 20px;} - .sidebar-box ul li.h4, - .sidebar-box ul li li li li { margin-right: 30px; font-size: 11px; margin-left: 20px; } diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss index be813c8..f011b20 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -10,22 +10,29 @@ <% if IsDev %> <% require javascript(toolbar/javascript/toolbar.js?site=doc&searchShow=true) %> - <% require css(toolbar/css/toolbar.css) %> + <% require css(toolbar/css/toolbar.css) %> + + <% require css(themes/ssorgsites/css/core.css) %> + <% require css(themes/ssorgsites/css/grid.css) %> + <% require css(themes/ssorgsites/css/typography.css) %> + <% require css(themes/ssorgsites/css/form.css) %> + <% require css(themes/ssorgsites/css/print.css, print) %> <% else %> <% require javascript(http://silverstripe.org/toolbar/javascript/toolbar.min.js?site=doc&searchShow=true) %> <% require css(http://silverstripe.org/toolbar/css/toolbar.css) %> + <% require css(themes/ssorgsites/css/ss.screen.min.css, screen) %> + <% require css(themes/ssorgsites/css/ss.print.min.css, print) %> <% end_if %> - <% require css(themes/ssorgsites/css/ss.screen.min.css, screen) %> - <% require css(themes/ssorgsites/css/ss.print.min.css, print) %> + <% require themedCSS(DocumentationViewer) %> -
+ <% if Entities %> -
+

Modules:

    <% control Entities %>
  • $Title
    • <% end_control %>
+ +
<% end_if %> <% if Versions %> -
+

Versions:

    <% control Versions %> diff --git a/themes/docs/templates/Layout/DocumentationViewer.ss b/themes/docs/templates/Layout/DocumentationViewer.ss index 5572183..1f44204 100644 --- a/themes/docs/templates/Layout/DocumentationViewer.ss +++ b/themes/docs/templates/Layout/DocumentationViewer.ss @@ -1,12 +1,12 @@
    -
    +
    $Content <% include Comments %>
    <% if Content %> -
    + diff --git a/themes/docs/templates/Layout/Page.ss b/themes/docs/templates/Layout/Page.ss index 5ea49da..4a144ab 100644 --- a/themes/docs/templates/Layout/Page.ss +++ b/themes/docs/templates/Layout/Page.ss @@ -2,7 +2,7 @@ <% include Sidebar %> <% end_if %> -
    +

    $Title

    $Content