Updating wiki.php and site.css, to match version

This commit is contained in:
Ubergeek 2019-07-01 21:55:26 +00:00
parent 419e69a0e3
commit 8e9bd8304d
2 changed files with 65 additions and 11 deletions

View File

@ -7,6 +7,7 @@ body {
padding-right: 5pt; padding-right: 5pt;
padding-top: 5pt; padding-top: 5pt;
background-color: #040304; background-color: #040304;
width: 90%;
} }
@ -44,8 +45,40 @@ a:hover, a:active {
} }
div.footer { /*
font-size: 9pt; This file is licensed under the GPL 3.0 or later.
*/
body {
font-family: Sans-serif;
}
#body {
width: 90%;
font-size: medium;
}
#header {
width: 90%;
text-align: center;
font-size: xx-large;
}
#content {
width: 78%;
float: left;
font-size: medium;
}
#sidebar {
width: 18%;
float: right;
font-size: small;
}
#footer {
width: 90%;
text-align: center;
clear: both;
font-size: smaller;
font-style: italic; font-style: italic;
line-height: 12pt; line-height: 12pt;
text-align: center; text-align: center;

View File

@ -14,27 +14,48 @@ print "<!DOCTYPE html>
<title>$site_name - $page</title> <title>$site_name - $page</title>
<link rel='stylesheet' type='text/css' href='$site_root/includes/site.css'> <link rel='stylesheet' type='text/css' href='$site_root/includes/site.css'>
</head> </head>
<body>"; <body>
<!-- Begin Header -->
<div id='header'>";
echo ( shell_exec("/usr/bin/pandoc $doc_root/includes/header.md") ); echo ( shell_exec("/usr/bin/pandoc $doc_root/includes/header.md") );
print "
</div>
<!-- End Header -->
";
print "<hr> print "<hr>
<div id='body' style='width: 90%;'> <div id='body'>
<div id='sidebar' style='width: 20%;float:left;'>";
<!-- Begin Sidebar -->
<div id='sidebar'>
";
echo ( shell_exec("/usr/bin/pandoc $doc_root/includes/sidebar.md") ); echo ( shell_exec("/usr/bin/pandoc $doc_root/includes/sidebar.md") );
print " </div> print " </div>
<div id='content' style='width: 80%; float:right;'>"; <!-- End Sidebar -->
<!-- Begin Body -->
<div id='content'>";
echo ( shell_exec("/usr/bin/pandoc $doc_root/articles/$page.md") ); echo ( shell_exec("/usr/bin/pandoc $doc_root/articles/$page.md") );
print " </div> print " </div>
<!-- End Body -->
</div> </div>
<div id='footer' style='clear:both;'>
<hr>"; <!-- Begin Footer -->
<div id='footer'>
<hr>
";
echo ( shell_exec("/usr/bin/pandoc $doc_root/includes/footer.md") ); echo ( shell_exec("/usr/bin/pandoc $doc_root/includes/footer.md") );
print " </div> print " </div>
<!-- End Footer -->
</body> </body>
</html>"; </html>";
?> ?>