From c3387c5514d35210cf10c30e8ec6a181badf521a Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Thu, 28 Oct 2010 21:28:45 +0000 Subject: [PATCH] Tweaked styles and scripts. Use ss.screen.min and ss.print.min git-svn-id: http://svn.silverstripe.com/projects/ss2doc/branches/v2@113211 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- scripts/pull-from-git | 2 +- themes/docs/css/DocumentationViewer.css | 14 +----- themes/docs/templates/DocumentationViewer.ss | 53 ++++++++++++++++++++ themes/docs/templates/Page.ss | 4 +- 4 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 themes/docs/templates/DocumentationViewer.ss diff --git a/scripts/pull-from-git b/scripts/pull-from-git index 0df0bf3..b393fb5 100755 --- a/scripts/pull-from-git +++ b/scripts/pull-from-git @@ -28,7 +28,7 @@ else # git pull must be performed in the folder with the checkout echo "Updating documentation" cd $temp - git pull + git pull origin master cd ../ fi diff --git a/themes/docs/css/DocumentationViewer.css b/themes/docs/css/DocumentationViewer.css index 58394cd..c15ee55 100644 --- a/themes/docs/css/DocumentationViewer.css +++ b/themes/docs/css/DocumentationViewer.css @@ -1,12 +1,9 @@ /** - * Documentation Viewer Styles. + * Documentation Viewer Styles. Uses the base styles from ss.screen.min.css * * @author Will Rossiter */ -/* Reset */ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{ margin:0;padding: 0;} - /* Core */ html { background: #f4f4f4;} body { font: 14px/1.1 Arial,sans-serif; color: #444; } @@ -17,15 +14,6 @@ a { color: #1389ce; text-decoration: none; } p { font-size: 14px; line-height: 22px; margin-bottom: 22px; } -ul { margin: 11px 0 22px 20px; } - li { font-size: 12px; line-height: 13px; margin-bottom: 8px;} - - -h1 { font-size: 33px; line-height: 33px; margin-bottom: 22px; color: #111; letter-spacing: -1px;} -h2 { font-size: 24px; line-height: 33px; margin-bottom: 11px; color: #111; } -h3 { font-size: 18px; line-height: 22px; margin-bottom: 11px; color: #111; } -h4 { font-size: 16px; margin-bottom: 11px; line-height: 22px;} -h5 { font-size: 14px; line-height: 22px; margin-bottom: 11px;} pre { margin-bottom: 22px; diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss new file mode 100644 index 0000000..73e3e9b --- /dev/null +++ b/themes/docs/templates/DocumentationViewer.ss @@ -0,0 +1,53 @@ + + + + + <% base_tag %> + + <% if Title %>$Title<% end_if %> SilverStripe Documentation + + <% require css(themes/ssorgsites/css/ss.screen.min.css, screen) %> + <% require css(themes/ssorgsites/css/ss.print.min.css, print) %> + <% require themedCSS(DocumentationViewer) %> + + + +
+ + +
+
+

Versions:

+ +
    + <% control Versions %> + <% if MajorRelease %> +
  • $Title
    • + <% else %> +
  • $Title
    • + <% end_if %> + <% end_control %> +
+
+ +
+ $Layout +
+
+
+ + + + \ No newline at end of file diff --git a/themes/docs/templates/Page.ss b/themes/docs/templates/Page.ss index 40f444e..6764daf 100644 --- a/themes/docs/templates/Page.ss +++ b/themes/docs/templates/Page.ss @@ -9,7 +9,9 @@ - <% require css(themes/ssorgsites/css/ss.all.min.css) %> + <% require css(themes/ssorgsites/css/ss.screen.min.css, screen) %> + <% require css(themes/ssorgsites/css/ss.print.min.css, print) %> + <% require css(themes/docs/css/documentation.css) %>