tonyair
/
doc.silverstripe.org
mirror of https://github.com/silverstripe/doc.silverstripe.org
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Hotfix/logo clipping title fix
This commit is contained in:
Cam Findlay 2016-11-11 10:18:55 +13:00 committed by GitHub
parent c1445b3409 c071821b98
commit 6553bf10e2
5 changed files with 87 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -558,12 +558,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
"reference": "b8dea84832d46723b0f94e52211227f4ed7d419a" "reference": "9d7a1f621049980167a5a3ba4e7b418a62ee55ee"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/b8dea84832d46723b0f94e52211227f4ed7d419a", "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/9d7a1f621049980167a5a3ba4e7b418a62ee55ee",
"reference": "b8dea84832d46723b0f94e52211227f4ed7d419a", "reference": "9d7a1f621049980167a5a3ba4e7b418a62ee55ee",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -591,7 +591,7 @@
"documentation", "documentation",
"silverstripe" "silverstripe"
], ],
"time": "2016-10-27 21:07:02" "time": "2016-11-07 13:31:41"
}, },
{ {
"name": "silverstripe/dynamodb", "name": "silverstripe/dynamodb",

9
themes/docs/css/styles.css
View File

@ -100,13 +100,18 @@ form .message.error {
display: none; display: none;
} }
/* SilverStripe logo on top of page */ /* SilverStripe logo on top of page */
#masthead .menu-bar {
margin-bottom: 24px;
height: 40px;
}
#masthead .logo { #masthead .logo {
display: inline-block; display: inline-block;
float: left; float: left;
height: 40px; height: 40px;
width: 75%; width: 140px;
margin-bottom: 24px;
margin-left: 4px; margin-left: 4px;
margin-top: 4px;
background: url(https://www.silverstripe.org/themes/ssv3/img/global-logo-open-source.svg) no-repeat; background: url(https://www.silverstripe.org/themes/ssv3/img/global-logo-open-source.svg) no-repeat;
} }
} }

13
themes/docs/templates/DocumentationViewer.ss vendored
View File

@ -5,13 +5,12 @@
<div id="masthead" <% if Versions %>class="has_versions"<% end_if %>> <div id="masthead" <% if Versions %>class="has_versions"<% end_if %>>
<div class="wrapper"> <div class="wrapper">
<a class="logo" href="https://docs.silverstripe.org/"></a> <div class="menu-bar">
<a class="menu-toggle"> <a class="logo" href="https://userhelp.silverstripe.org/"></a>
<span></span> <a class="menu-open">
<span></span> <%t DocumentationViewer.MENU "Menu" %>
<span></span> </a>
<span></span> </div>
</a>
<% if Breadcrumbs.count > 1 %> <% if Breadcrumbs.count > 1 %>
<% include DocumentationBreadcrumbs %> <% include DocumentationBreadcrumbs %>
<% else_if Page.Title %> <% else_if Page.Title %>

35
themes/docs/templates/DocumentationViewer_all.ss vendored Normal file
View File

@ -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>

35
themes/docs/templates/DocumentationViewer_results.ss vendored Normal file
View File

@ -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>