diff --git a/composer.lock b/composer.lock index b2b26f0bb..3350d083d 100644 --- a/composer.lock +++ b/composer.lock @@ -558,12 +558,12 @@ "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git", - "reference": "b8dea84832d46723b0f94e52211227f4ed7d419a" + "reference": "9d7a1f621049980167a5a3ba4e7b418a62ee55ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/b8dea84832d46723b0f94e52211227f4ed7d419a", - "reference": "b8dea84832d46723b0f94e52211227f4ed7d419a", + "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/9d7a1f621049980167a5a3ba4e7b418a62ee55ee", + "reference": "9d7a1f621049980167a5a3ba4e7b418a62ee55ee", "shasum": "" }, "require": { @@ -591,7 +591,7 @@ "documentation", "silverstripe" ], - "time": "2016-10-27 21:07:02" + "time": "2016-11-07 13:31:41" }, { "name": "silverstripe/dynamodb", diff --git a/themes/docs/css/styles.css b/themes/docs/css/styles.css index 4138218c0..b9dcd8ace 100644 --- a/themes/docs/css/styles.css +++ b/themes/docs/css/styles.css @@ -100,13 +100,18 @@ form .message.error { display: none; } /* SilverStripe logo on top of page */ + #masthead .menu-bar { + margin-bottom: 24px; + height: 40px; + } + #masthead .logo { display: inline-block; float: left; height: 40px; - width: 75%; - margin-bottom: 24px; + width: 140px; margin-left: 4px; + margin-top: 4px; background: url(https://www.silverstripe.org/themes/ssv3/img/global-logo-open-source.svg) no-repeat; } } diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss index f724517fc..3273a9870 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -5,13 +5,12 @@
class="has_versions"<% end_if %>>
- - - - - - - +
+ + + <%t DocumentationViewer.MENU "Menu" %> + +
<% if Breadcrumbs.count > 1 %> <% include DocumentationBreadcrumbs %> <% else_if Page.Title %> diff --git a/themes/docs/templates/DocumentationViewer_all.ss b/themes/docs/templates/DocumentationViewer_all.ss new file mode 100644 index 000000000..dd4642066 --- /dev/null +++ b/themes/docs/templates/DocumentationViewer_all.ss @@ -0,0 +1,35 @@ + + + + <% include DocumentationHead %> + +
class="has_versions"<% end_if %>> +
+ +
+

+ Documentation + / + Index +

+
+ + + +
+
+ +
+
+ + $Layout + + <% include DocumentationFooter %> + +
+
+ + + <% include DocumentationGA %> + <% include DocumentationEnd %> + diff --git a/themes/docs/templates/DocumentationViewer_results.ss b/themes/docs/templates/DocumentationViewer_results.ss new file mode 100644 index 000000000..637d84241 --- /dev/null +++ b/themes/docs/templates/DocumentationViewer_results.ss @@ -0,0 +1,35 @@ + + + + <% include DocumentationHead %> + +
class="has_versions"<% end_if %>> +
+ +
+

+ Documentation + / + Search +

+
+ + + +
+
+ +
+
+ + $Layout + + <% include DocumentationFooter %> + +
+
+ + + <% include DocumentationGA %> + <% include DocumentationEnd %> +