From 2af9523048d4c88185a88cb8d57d2862ad9342e2 Mon Sep 17 00:00:00 2001 From: dvs1 Date: Thu, 13 Mar 2025 14:03:15 +1000 Subject: Attempt to tame the CSS. --- default.template | 48 ++++++++++++++++++++++++++++++------------------ notYetAnotherWiki.lua | 7 +++---- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/default.template b/default.template index 8f918f3..f87666c 100644 --- a/default.template +++ b/default.template @@ -20,29 +20,33 @@ overflow-x: auto; width: 99%; margin: 2px; + border: 2px solid grey; } - table, td, th {border-collapse: collapse;border: 2px solid grey;} + table, td, th {border-collapse: collapse; border: 2px solid grey;} .toolTip {background: darkcyan;} .boxWrapper { height: 100%; width: 100%; + margin: 0; padding: 0; border: none; display: grid; // grid-template-areas: // "logo0 trail" // "logo1 head" // "menu body" // "history foot"; - grid-template-columns: auto 1fr auto; - grid-template-rows: auto auto 1fr auto; + grid-template-columns: auto 1fr auto auto; + grid-template-rows: auto auto 1fr auto auto; // grid-auto-columns: minmax(auto, auto); // grid-auto-rows: minmax(auto, auto); overflow-x: auto; overflow-y: auto; } - .boxLogo0 {grid-area: logo0; grid-column: 1 / 3; grid-row: 1 / 1; height: min-content; margin: 0; padding: 0; border: none;} - .boxLogo1 {grid-area: logo1; grid-column: 1 / 3; grid-row: 2 / 2; height: min-content; margin: 0; padding: 0; border: none;} - .boxHead {grid-area: head; grid-column: 2 / 4; grid-row: 1 / 1; height: min-content; margin: 0; padding: 0; border: none; text-align: right;} - .boxTrail {grid-area: trail; grid-column: 2 / 4; grid-row: 2 / 2; height: min-content; margin: 0; padding: 0; border: none;} + .boxLogo0 {grid-area: logo0; grid-column: 1 / 1; grid-row: 1 / 1; height: min-content;} + .boxLogo1 {grid-area: logo1; grid-column: 1 / 1; grid-row: 2 / 2; height: min-content;} + + .boxTrail {grid-area: trail; grid-column: 2 / 4; grid-row: 1 / 1; height: min-content;} + .boxHead {grid-area: head; grid-column: 2 / 4; grid-row: 2 / 2; height: min-content; text-align: right;} + .boxMenu {grid-area: menu; grid-column: 1 / 1; grid-row: 3 / 3; height: min-content; width: min-content; vertical-align: top; padding: 4px;} .boxBody {grid-area: body; grid-column: 2 / 4; grid-row: 3 / 3; vertical-align: top; height: 100%; width: 100%; @@ -52,12 +56,16 @@ .boxBody a:link {color: orange;} .boxBody a:visited {color: $onefangGreen$;} .boxBody a:hover {color: red;} - .boxHistory {grid-area: history; grid-column: 1 / 1; grid-row: 4 / 4; height: min-content; margin: 0; padding: 0; border: none;} - .boxFoot {grid-area: foot; grid-column: 2 / 4; grid-row: 4 / 4; height: min-content; margin: 0; padding: 0; border: none; text-align: right;} + + .boxHistory {grid-area: history; grid-column: 1 / 1; grid-row: 4 / 4; height: min-content;} + .boxFoot {grid-area: foot; grid-column: 2 / 4; grid-row: 4 / 4; height: min-content; text-align: right;} + .boxnyaw {grid-area: foot; grid-column: 1 / 4; grid-row: 5 / 5; height: min-content; text-align: right; font-size: 0.55em;} #modeToggleBody {display: none;} #modeToggleMenu {display: none;} #modeBtn {color: white; display: inline-block;} + #modeToggleBody:checked ~ body background-image: linear-gradient($karenPurple$, $onefangPurple$);{} + #modeToggleBody:checked ~ pre {background-image: linear-gradient(to right, $onefangPurple$, $PinkFloyd$);} #modeToggleBody:checked ~ .modeBtn {color: black;} #modeToggleBody:checked ~ .boxBody {background: white; color: black;} #modeToggleBody:checked ~ .boxBody a:active {color: $devuanDevuanalink$;} @@ -70,10 +78,16 @@ #modeToggleMenu:checked ~ .boxMenu {display: none;} #modeToggleMenu:checked ~ .boxHistory {display: none;} #modeToggleMenu:checked ~ .boxFoot {display: none;} + #modeToggleMenu:checked ~ .boxnyaw {display: none;}
+ + +
-
-
$body$
-
-
+
+
+
$body$
$history$
-

$footer$

-

No cookies or scripts where harmed in the making of this web site. May contain low fat CSS.

-
+
$footer$
+
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua index c337af2..f1b1565 100755 --- a/notYetAnotherWiki.lua +++ b/notYetAnotherWiki.lua @@ -28,7 +28,6 @@ local GlobalMetaData = { karenPurple = '#8800ff', onefangPurple = '#cc00ff', onefangGreen = '#42ff00', PinkFloyd = '#AA00AA', DeepPurple = '#220022', -- From an ancient site of mine, which went from PinkFloyd to DeepPurple as a background gradient. favicon = 'nYAW_icon.png', logo = 'nYAW.png', - footer = 'Powered by notYetAnotherWiki v 0.0', } local Files, Subs, xLinks = {}, {}, {} @@ -745,11 +744,11 @@ for name, file in pairs(Files) do end -- Figure out this pages footer links. - metadata.footer = GlobalMetaData.footer + metadata.footer = '' if nil ~= metadata.pagehistory then metadata.history = '

Page history

' else metadata.history = '' end - if nil ~= metadata.sourcecode then metadata.footer = 'source code     ' .. metadata.footer end + if nil ~= metadata.sourcecode then metadata.footer = 'source code' end if nil ~= metadata.feedatom then metadata.footer = 'atom feed     ' .. metadata.footer end - if metadata.footer ~= GlobalMetaData.footer then metadata.footer = 'Web site ' .. metadata.footer end + if metadata.footer ~= '' then metadata.footer = 'Web site ' .. metadata.footer end -- Add a link to the original page. if nil ~= metadata.ogURL then local title, link = whichWiki(metadata) -- cgit v1.1