wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix up sidebar conditional

Browse Source
This commit is contained in:
eston
2011-03-02 17:56:34 -08:00
parent 175408e6bd
commit d87750c39d
3 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/public/css/gollum.css
+26 -22
View File
@@ -70,32 +70,40 @@ a:hover, a:visited {
display: block; display: block;
float: left; float: left;
margin-right: 3%; margin-right: 3%;
width: 70%; width: 100%;
}
.has-rightbar #wiki-body {
width: 68%;
} }
/* @section rightbar */ /* @section rightbar */
#wiki-rightbar { #wiki-rightbar {
float: right;
width: 27%;
}
#wiki-rightbar #nav {
background-color: #f7f7f7; background-color: #f7f7f7;
border: 1px solid #ddd; border: 1px solid #ddd;
margin-top: 1.5em; float: right;
padding: 1em; padding: 7px;
width: 25%;
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-rightbar #nav { #wiki-rightbar {
font-size: 1.2em; font-size: 1.0em;
line-height: 1.5em; line-height: 1.3em;
} }
#wiki-rightbar #nav p.parent { #wiki-rightbar p {
margin: 13px 0 0;
}
#wiki-rightbar > p:first-child {
margin-top: 0;
}
#wiki-rightbar p.parent {
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;
font-weight: bold; font-weight: bold;
margin: 0 0 0.5em 0; margin: 0 0 0.5em 0;
@@ -104,12 +112,12 @@ a:hover, a:visited {
} }
/* Back arrow */ /* Back arrow */
#wiki-rightbar #nav p.parent:before { #wiki-rightbar p.parent:before {
color: #666; color: #666;
content: "← "; content: "← ";
} }
#wiki-rightbar #nav h3 { #wiki-rightbar h3 {
font-size: 1.2em; font-size: 1.2em;
color: #333; color: #333;
margin: 1.2em 0 0; margin: 1.2em 0 0;
@@ -117,22 +125,18 @@ a:hover, a:visited {
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
#wiki-rightbar #nav ul { #wiki-rightbar ul {
margin: 0.5em 0 1em; margin: 0.5em 0 1em;
padding: 0; padding: 0;
} }
#wiki-rightbar #nav ul li { #wiki-rightbar ul li {
color: #bbb; color: #bbb;
list-style-position: outside;
list-style-type: none;
margin: 0 0 0 1em; margin: 0 0 0 1em;
padding: 0; padding: 0;
line-height: 1.75em; line-height: 1.75em;
} list-style-position: inside;
list-style-type: round;
#wiki-rightbar #nav ul li:hover {
list-style-type: square;
} }
#wiki-rightbar #nav ul li a { #wiki-rightbar #nav ul li a {
lib/gollum/frontend/public/css/template.css
-5
View File
@@ -159,11 +159,6 @@
padding: 6px 13px; padding: 6px 13px;
} }
/* Pygments-Processed Code Blocks */
/* Images & Stuff */ /* Images & Stuff */
#template img { #template img {
max-width: 100%; max-width: 100%;
lib/gollum/frontend/templates/page.mustache
+1 -1
View File
@@ -12,7 +12,7 @@
{{>searchbar}} {{>searchbar}}
</div> </div>
<div id="wiki-content"> <div id="wiki-content">
<div class="wrap{{#has_footer}} has-footer{{/has_footer}}{{#has_sidebar}}has-rightbar{{/has_sidebar}}"> <div class="wrap{{#has_footer}} has-footer{{/has_footer}}{{#has_sidebar}} has-rightbar{{/has_sidebar}}">
<div id="wiki-body"> <div id="wiki-body">
<div id="template"> <div id="template">
{{{content}}} {{{content}}}