Merge pull request #145 from silverstripe/hotfix/logo-clipping-title-fix

Hotfix/logo clipping title fix
silverstripe · Nov 10, 2016 · 6553bf1 · 6553bf1
2 parents c1445b3 + c071821
commit 6553bf1
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 13 deletions.
diff --git a/composer.lock b/composer.lock
diff --git 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
@@ -5,13 +5,12 @@
 
 	<div id="masthead" <% if Versions %>class="has_versions"<% end_if %>>
 		<div class="wrapper">
-			<a class="logo" href="https://docs.silverstripe.org/"></a>
-			<a class="menu-toggle">
-				<span></span>
-				<span></span>
-				<span></span>
-				<span></span>
-			</a>
+			<div class="menu-bar">
+				<a class="logo" href="https://userhelp.silverstripe.org/"></a>
+				<a class="menu-open">
+					<%t DocumentationViewer.MENU "Menu" %>
+				</a>
+			</div>
 			<% 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
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+
+<html>
+	<% include DocumentationHead %>
+
+	<div id="masthead" <% if Versions %>class="has_versions"<% end_if %>>
+		<div class="wrapper">
+
+			<div class="doc-breadcrumbs">
+				<p>
+					<a class="breadcrumb" href="$BaseHref">Documentation</a>
+					<span>/</span>
+					<a class="breadcrumb current">Index</a>
+				</p>
+			</div>
+
+
+
+		</div>
+	</div>
+
+	<div class="wrapper">
+		<div id="layout" class="clearfix">
+
+				$Layout
+
+				<% include DocumentationFooter %>
+
+		</div>
+	</div>
+
+
+	<% include DocumentationGA %>
+	<% include DocumentationEnd %>
+</html>
diff --git a/themes/docs/templates/DocumentationViewer_results.ss b/themes/docs/templates/DocumentationViewer_results.ss
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+
+<html>
+	<% include DocumentationHead %>
+
+	<div id="masthead" <% if Versions %>class="has_versions"<% end_if %>>
+		<div class="wrapper">
+
+			<div class="doc-breadcrumbs">
+				<p>
+					<a class="breadcrumb" href="$BaseHref">Documentation</a>
+					<span>/</span>
+					<a class="breadcrumb current">Search</a>
+				</p>
+			</div>
+
+
+
+		</div>
+	</div>
+
+	<div class="wrapper">
+		<div id="layout" class="clearfix">
+
+				$Layout
+
+				<% include DocumentationFooter %>
+
+		</div>
+	</div>
+
+
+	<% include DocumentationGA %>
+	<% include DocumentationEnd %>
+</html>