From e7e4d3be77447a84b2f52b83c2cce20d46afb029 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Fri, 1 Jul 2011 06:39:14 +0000 Subject: [PATCH] MINOR: tweaks to the top header to display all modules git-svn-id: http://svn.silverstripe.com/projects/ss2doc/branches/v2@119998 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- themes/docs/css/DocumentationViewer.css | 40 ++++++++++---------- themes/docs/templates/DocumentationViewer.ss | 26 +++++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/themes/docs/css/DocumentationViewer.css b/themes/docs/css/DocumentationViewer.css index 0a6a8a1..0a94d3b 100644 --- a/themes/docs/css/DocumentationViewer.css +++ b/themes/docs/css/DocumentationViewer.css @@ -9,12 +9,12 @@ a { color: #0973A6; text-decoration: none; } a:hover, a:focus { text-decoration: underline;} -p { font-size: 12px; line-height: 18px; margin-bottom: 18px; } +p { font-size: 12px; line-height: 16px; margin-bottom: 16px; } /* p { font-size: 14px; line-height: 22px; margin-bottom: 22px; } */ -#Form_LanguageForm { margin-top: 18px; } +#Form_LanguageForm { margin-top: 16px; } .clear { clear: both; } @@ -28,31 +28,29 @@ p { font-size: 12px; line-height: 18px; margin-bottom: 18px; } /* Content */ -#layout { } -#content { } -.typography h1+p { font-size: 16px; line-height: 1.25em; } +.typography h1+p { font-size: 18px; line-height: 24px; } -/* Versions */ -#versions-nav { +/* documentation navigation */ +.documentation-nav { clear: both; margin: 0 0 5px; overflow: hidden; color: #999999; font-size: 11px; } - #versions-nav h2 { font-size: 11px; font-weight: normal; float: left; margin-right: 5px;} - #versions-nav ul { margin: 0; padding: 0; float: left;} - #versions-nav .current { - background-color: #0973A6; - margin-left: 5px; - padding: 1px 7px; - border-radius: 8px; - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - color: #fff; - } - #versions-nav li { display: inline; list-style: none; padding: 0; margin: 0; font-size: 11px; } - #versions-nav li a { margin-left: 5px; padding: 0px; } - #versions-nav li a.current { background: #fff; color: #333;} + .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 { diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss index 519fdcb..be813c8 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -24,15 +24,10 @@
@@ -45,17 +40,24 @@ - + + <% if Entities %> +
+

Modules:

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

Versions:

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