Merge branch 'master' of /users/jy2wong/www/rofl/csc
Conflicts: .htaccess
This commit is contained in:
commit
639a6c5d94
|
@ -1,4 +0,0 @@
|
|||
RewriteEngine on
|
||||
RewriteBase /~j3parker/
|
||||
RewriteRule ^pub/(.*) - [L]
|
||||
RewriteRule ^(.*) bin/web [L]
|
|
@ -6,6 +6,8 @@ accent colour:
|
|||
#E2AA00
|
||||
dark blue:
|
||||
#2724AE
|
||||
alternate dark blue:
|
||||
#4A47AE
|
||||
*/
|
||||
|
||||
body {
|
||||
|
@ -13,7 +15,7 @@ body {
|
|||
text-align: center;
|
||||
color: black;
|
||||
background-color: white;
|
||||
font-family: Helvetica, Verdana, Arial, 'Liberation Sans', FreeSans, sans-serif;
|
||||
font-family: Helvetica, Verdana, Arial, DejaVu Sans, sans-serif;
|
||||
font-size: 84%; /* Enables font size scaling in MSIE */
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
@ -63,7 +65,7 @@ a:hover { text-decoration: underline; }
|
|||
|
||||
.midHeader {
|
||||
color: #fff;
|
||||
background-color: #2724AE;
|
||||
background-color: #4A47AE;
|
||||
border-bottom: solid 2px #E2AA00;
|
||||
}
|
||||
|
||||
|
@ -192,7 +194,7 @@ padding: 0;}
|
|||
|
||||
#horiz-side-bar ul:first-child li a:hover {
|
||||
/*
|
||||
background-color: #2724AE;
|
||||
background-color: #4A47AE;
|
||||
*/
|
||||
|
||||
background-color: #eee;
|
||||
|
@ -217,9 +219,9 @@ padding: 0;}
|
|||
#horiz-side-bar ul:first-child li.thisPage a {
|
||||
/*
|
||||
color: #fff;
|
||||
background-color: #2724AE;
|
||||
background-color: #4A47AE;
|
||||
*/
|
||||
border-left: 0.5em solid #2724AE;
|
||||
border-left: 0.5em solid #4A47AE;
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
|
@ -328,13 +330,13 @@ li ul {
|
|||
padding: 2mm 5mm 2mm 5mm;
|
||||
}
|
||||
|
||||
#main-copy p {
|
||||
#main-copy p, #main-copy li {
|
||||
margin: 1em 1ex 1em 1ex !important; /* Need !important so troff-generated pages don't look totally squezed */
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#main-copy a {
|
||||
color: #2724AE;
|
||||
color: #4A47AE;
|
||||
color: #E2AA00;
|
||||
color: rgb(100,135,220);
|
||||
text-decoration: underline;
|
||||
|
@ -410,7 +412,7 @@ dd {
|
|||
/* # Footer # */
|
||||
#footer {
|
||||
color: white;
|
||||
background-color: #2724AE;
|
||||
background-color: #4A47AE;
|
||||
padding: 0.25ex;
|
||||
clear: both;
|
||||
border-top: solid 2px #E2AA00;
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
const string url_root = "/";
|
||||
|
||||
const string site_title = "This is a Title";
|
||||
const string site_subtitle = "but this is a subtitle";
|
||||
|
||||
const bool nav_tree_vert = false;
|
||||
|
||||
string[string] handlers;
|
||||
|
||||
void init_handlers() {
|
||||
handlers["*.md"] = "contrib/Markdown.pl";
|
||||
handlers["changelog"] = "changelog.sh";
|
||||
}
|
|
@ -11,10 +11,9 @@ void html_push(string s) { html(s); indent ~= " "; }
|
|||
|
||||
void write_link(string to, bool expand) {
|
||||
bool isdir = dirExists(dweb_root ~ "/srv/" ~ to[url_root.length..$]);
|
||||
string flair = nav_tree_chev? (expand? "» " : "› ") : "";
|
||||
html_push("<li" ~ (expand? " class=\"thisPage\" " : "") ~ ">");
|
||||
html("<a href=\"" ~ to ~ (isdir ? "/" : "") ~ "\">"
|
||||
~ flair ~ baseName(to) ~ (isdir ? "/" : "") ~ "</a>");
|
||||
~ baseName(to) ~ (isdir ? "/" : "") ~ "</a>");
|
||||
html_pop("</li>");
|
||||
}
|
||||
|
||||
|
@ -167,13 +166,13 @@ void main(string[] args) {
|
|||
html("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">");
|
||||
html_pop("</head>\n");
|
||||
|
||||
html_push("<body" ~ (page_container? " style=\"text-align: center\"" : "")~ ">");
|
||||
if (page_container) html_push("<div id=\"container\">");
|
||||
html_push("<body style=\"text-align: center\">");
|
||||
html_push("<div id=\"container\">");
|
||||
do_header();
|
||||
do_nav_tree(url);
|
||||
do_content(url);
|
||||
do_footer();
|
||||
if (page_container) html_pop("</div>");
|
||||
html_pop("</div>");
|
||||
html_pop("</body>\n");
|
||||
|
||||
html_pop("</html>");
|
||||
|
|
Loading…
Reference in New Issue