From de5b9b33eea01266580b1e55e320ff3fb160e559 Mon Sep 17 00:00:00 2001 From: Jared Lee Date: Fri, 21 Oct 2016 15:50:52 +1300 Subject: [PATCH 1/3] Added logo button to all templates and fixed title clipping with logo button --- themes/docs/css/styles.css | 9 +++- themes/docs/templates/DocumentationViewer.ss | 16 ++++--- .../docs/templates/DocumentationViewer_all.ss | 44 +++++++++++++++++++ .../templates/DocumentationViewer_results.ss | 44 +++++++++++++++++++ 4 files changed, 104 insertions(+), 9 deletions(-) create mode 100644 themes/docs/templates/DocumentationViewer_all.ss create mode 100644 themes/docs/templates/DocumentationViewer_results.ss diff --git a/themes/docs/css/styles.css b/themes/docs/css/styles.css index 4138218..b9dcd8a 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 f724517..2743b2d 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -5,13 +5,15 @@
class="has_versions"<% end_if %>>
- - - - - - - +
+ + + + + + + +
<% 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 0000000..e6812eb --- /dev/null +++ b/themes/docs/templates/DocumentationViewer_all.ss @@ -0,0 +1,44 @@ + + + + <% 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 0000000..697ecb9 --- /dev/null +++ b/themes/docs/templates/DocumentationViewer_results.ss @@ -0,0 +1,44 @@ + + + + <% include DocumentationHead %> + +
class="has_versions"<% end_if %>> +
+ +
+

+

+ + + + + + + +
+ Documentation + / + Search +

+
+ + + +
+
+ +
+
+ + $Layout + + <% include DocumentationFooter %> + +
+
+ + + <% include DocumentationGA %> + <% include DocumentationEnd %> + From 3f618e8aba4ce233b77c067f835a8e00fafba34a Mon Sep 17 00:00:00 2001 From: Jared Lee Date: Thu, 3 Nov 2016 10:46:46 +1300 Subject: [PATCH 2/3] Removed sidebar menu button from mobile search and replaced hamburger with button for mobile --- themes/docs/templates/DocumentationViewer.ss | 7 ++----- themes/docs/templates/DocumentationViewer_all.ss | 9 --------- themes/docs/templates/DocumentationViewer_results.ss | 9 --------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss index 2743b2d..d1f0dd6 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -7,11 +7,8 @@
- - - - - + + MENU
<% if Breadcrumbs.count > 1 %> diff --git a/themes/docs/templates/DocumentationViewer_all.ss b/themes/docs/templates/DocumentationViewer_all.ss index e6812eb..dd46420 100644 --- a/themes/docs/templates/DocumentationViewer_all.ss +++ b/themes/docs/templates/DocumentationViewer_all.ss @@ -8,15 +8,6 @@

-

- - - - - - - -
Documentation / Index diff --git a/themes/docs/templates/DocumentationViewer_results.ss b/themes/docs/templates/DocumentationViewer_results.ss index 697ecb9..637d842 100644 --- a/themes/docs/templates/DocumentationViewer_results.ss +++ b/themes/docs/templates/DocumentationViewer_results.ss @@ -8,15 +8,6 @@

-

- - - - - - - -
Documentation / Search From c071821b989d50ac89848a505940d230c1b70c04 Mon Sep 17 00:00:00 2001 From: Jared Lee Date: Fri, 4 Nov 2016 16:27:42 +1300 Subject: [PATCH 3/3] Updated mobile menu button name with translation functionality --- composer.lock | 8 ++++---- themes/docs/templates/DocumentationViewer.ss | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index b2b26f0..3350d08 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/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss index d1f0dd6..3273a98 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -8,7 +8,7 @@
- MENU + <%t DocumentationViewer.MENU "Menu" %>
<% if Breadcrumbs.count > 1 %>