diff --git a/macros/macros.py b/macros/macros.py index d1b74e9..4bccb52 100755 --- a/macros/macros.py +++ b/macros/macros.py @@ -10,10 +10,8 @@ import mege.git as git import mege.misc as misc -def download_prog(root, fname): - return '' - -def list_pages(pathdir): +def list_pages(pathdir=None): + pathdir = misc.macrog('pathdir', pathdir) dl = htmlfunc.DefList() fs = [(p if os.path.isfile(p) else os.path.join( p, 'index.org'), f, f[:-4] if os.path.isfile(p) else f + '/') for p, f in filter( diff --git a/macros/macros.pyc b/macros/macros.pyc index 1564941..120bd25 100644 Binary files a/macros/macros.pyc and b/macros/macros.pyc differ diff --git a/prestatic/aesthetics.js b/prestatic/aesthetics.js index e3a0508..307299a 100644 --- a/prestatic/aesthetics.js +++ b/prestatic/aesthetics.js @@ -41,7 +41,7 @@ set_min_height = function() { metadiv.style.width = (contentdiv.offsetWidth - 42) + 'px'; contentdiv.style.paddingBottom = h + 'px'; - h = wh - h - menudiv.offsetHeight - 145; + h = wh - h - menudiv.offsetHeight - 165; contentdiv.style.minHeight = h + 'px'; }; diff --git a/prestatic/screen.css b/prestatic/screen.css index fae0e12..266d8a5 100644 --- a/prestatic/screen.css +++ b/prestatic/screen.css @@ -304,14 +304,14 @@ del { } hr { - margin: 4px 0; + margin: 5px 0; } /* Lists */ ul, ol { - margin-bottom: 4px; + margin-top: 5px; list-style-position: inside; } @@ -370,7 +370,7 @@ dl > dl { /* Tables */ table { - margin: 0 auto; + margin: 5px auto; border-collapse: collapse; } @@ -529,7 +529,11 @@ div.left-float, img.left-float, video.left-float, audio.left-float { border: 1px outset black; } -.note p, .warning p { +.notice { + background-color: yellow; +} + +.notice p, .note p, .warning p { margin-bottom: 5px; } diff --git a/prestatic/template.html b/prestatic/template.html index 6792d40..4515502 100644 --- a/prestatic/template.html +++ b/prestatic/template.html @@ -1,6 +1,7 @@ @@ -88,7 +89,7 @@ for x in('projects', 'writings', 'about', 'sitemap'): + print("

View source

".format(page.sourcepath), end='')@-->