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
This commit is contained in:
Will Rossiter 2011-08-02 01:50:38 +00:00
parent fb8ab2c1c8
commit c9594f6dac
4 changed files with 39 additions and 116 deletions

View File

@ -1,22 +1,9 @@
/**
* Documentation Viewer Styles. Uses the base styles from ss.screen.min.css
*
* @author Will Rossiter <will@silverstripe.com>
* 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; }

View File

@ -10,22 +10,29 @@
<% if IsDev %>
<% require javascript(toolbar/javascript/toolbar.js?site=doc&amp;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&amp;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) %>
</head>
<body>
<div id="container">
<div id="container" class="container">
<div id="header">
<h1>
<a href="http://www.silverstripe.org" title="Visit SilverStripe.org" class="ssLogo">&nbsp;</a>
<a href="http://www.silverstripe.org" title="Visit SilverStripe.org" class="logo">&nbsp;</a>
<a href="$Top.Link" title="Documentation"><span><% _t('SILVERSTRIPEDOCUMENTATION', 'Documentation') %></span></a>
</h1>
</div>
@ -42,18 +49,20 @@
</div>
<% if Entities %>
<div id="entities-nav" class="documentation-nav">
<div id="entities-nav" class="documentation-nav clearfix">
<h2>Modules:</h2>
<ul>
<% control Entities %>
<li><a href="$Link" class="$LinkingMode">$Title</a></li>
<% end_control %>
</ul>
<div class="clear"><!-- --></div>
</div>
<% end_if %>
<% if Versions %>
<div id="versions-nav" class="documentation-nav">
<div id="versions-nav" class="documentation-nav clearfix">
<h2>Versions:</h2>
<ul>
<% control Versions %>

View File

@ -1,12 +1,12 @@
<div id="documentation-page">
<div id="left-column">
<div id="content-column">
$Content
<% include Comments %>
</div>
<% if Content %>
<div id="right-column">
<div id="sidebar-column">
<% include DocTableOfContents %>
<% include DocInThisModule %>
</div>

View File

@ -2,7 +2,7 @@
<% include Sidebar %>
<% end_if %>
<div id="content" class="<% if Menu(2) %>has-sidebar<% end_if %>">
<div id="content-column" class="<% if Menu(2) %>has-sidebar<% end_if %>">
<h2>$Title</h2>
$Content