Merge pull request #322 from kristi/header-feature

Header feature
This commit is contained in:
Corey Donohoe
2012-05-07 20:42:14 -07:00
2 changed files with 341 additions and 337 deletions
@@ -127,18 +127,22 @@ a:hover, a:visited {
width: 70%; width: 70%;
} }
#wiki-header #header-content,
#wiki-footer #footer-content { #wiki-footer #footer-content {
background-color: #f7f7f7; background-color: #f7f7f7;
border: 1px solid #ddd; border: 1px solid #ddd;
font-size: 1.2em;
line-height: 1.5em;
margin-top: 1.5em;
padding: 1em; padding: 1em;
border-radius: 0.5em; border-radius: 0.5em;
-moz-border-radius: 0.5em; -moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em; -webkit-border-radius: 0.5em;
} }
#wiki-header #header-content {
margin-bottom: 1.5em;
}
#wiki-footer #footer-content {
margin-top: 1.5em;
}
#wiki-footer #footer-content h3 { #wiki-footer #footer-content h3 {
font-size: 1.2em; font-size: 1.2em;
+3 -3
View File
@@ -22,7 +22,7 @@
<div id="wiki-body" class="gollum-{{format}}-content"> <div id="wiki-body" class="gollum-{{format}}-content">
{{#has_header}} {{#has_header}}
<div id="wiki-header" class="gollum-{{header_format}}-content"> <div id="wiki-header" class="gollum-{{header_format}}-content">
<div id="header-content"> <div id="header-content" class="markdown-body">
{{{header_content}}} {{{header_content}}}
</div> </div>
</div> </div>
@@ -33,14 +33,14 @@
</div> </div>
{{#has_sidebar}} {{#has_sidebar}}
<div id="wiki-rightbar" class="gollum-{{sidebar_format}}-content"> <div id="wiki-rightbar" class="gollum-{{sidebar_format}}-content">
<div class="markdown-body"> <div id="sidebar-content" class="markdown-body">
{{{sidebar_content}}} {{{sidebar_content}}}
</div> </div>
</div> </div>
{{/has_sidebar}} {{/has_sidebar}}
{{#has_footer}} {{#has_footer}}
<div id="wiki-footer" class="gollum-{{footer_format}}-content"> <div id="wiki-footer" class="gollum-{{footer_format}}-content">
<div id="footer-content"> <div id="footer-content" class="markdown-body">
{{{footer_content}}} {{{footer_content}}}
</div> </div>
</div> </div>