diff options
author | dvs1 | 2025-03-13 14:03:15 +1000 |
---|---|---|
committer | dvs1 | 2025-03-13 14:03:15 +1000 |
commit | 2af9523048d4c88185a88cb8d57d2862ad9342e2 (patch) | |
tree | 2a7bacf72d0cd717cf80e129e1f3a3a5e0baa5ee | |
parent | Shrink some parts of the footer. (diff) | |
download | notYetAnotherWiki-2af9523048d4c88185a88cb8d57d2862ad9342e2.zip notYetAnotherWiki-2af9523048d4c88185a88cb8d57d2862ad9342e2.tar.gz notYetAnotherWiki-2af9523048d4c88185a88cb8d57d2862ad9342e2.tar.bz2 notYetAnotherWiki-2af9523048d4c88185a88cb8d57d2862ad9342e2.tar.xz |
Attempt to tame the CSS.
-rw-r--r-- | default.template | 48 | ||||
-rwxr-xr-x | 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 @@ | |||
20 | overflow-x: auto; | 20 | overflow-x: auto; |
21 | width: 99%; | 21 | width: 99%; |
22 | margin: 2px; | 22 | margin: 2px; |
23 | border: 2px solid grey; | ||
23 | } | 24 | } |
24 | table, td, th {border-collapse: collapse;border: 2px solid grey;} | 25 | table, td, th {border-collapse: collapse; border: 2px solid grey;} |
25 | 26 | ||
26 | .toolTip {background: darkcyan;} | 27 | .toolTip {background: darkcyan;} |
27 | 28 | ||
28 | .boxWrapper { | 29 | .boxWrapper { |
29 | height: 100%; width: 100%; | 30 | height: 100%; width: 100%; |
31 | margin: 0; padding: 0; border: none; | ||
30 | display: grid; | 32 | display: grid; |
31 | // grid-template-areas: | 33 | // grid-template-areas: |
32 | // "logo0 trail" | 34 | // "logo0 trail" |
33 | // "logo1 head" | 35 | // "logo1 head" |
34 | // "menu body" | 36 | // "menu body" |
35 | // "history foot"; | 37 | // "history foot"; |
36 | grid-template-columns: auto 1fr auto; | 38 | grid-template-columns: auto 1fr auto auto; |
37 | grid-template-rows: auto auto 1fr auto; | 39 | grid-template-rows: auto auto 1fr auto auto; |
38 | // grid-auto-columns: minmax(auto, auto); | 40 | // grid-auto-columns: minmax(auto, auto); |
39 | // grid-auto-rows: minmax(auto, auto); | 41 | // grid-auto-rows: minmax(auto, auto); |
40 | overflow-x: auto; overflow-y: auto; | 42 | overflow-x: auto; overflow-y: auto; |
41 | } | 43 | } |
42 | .boxLogo0 {grid-area: logo0; grid-column: 1 / 3; grid-row: 1 / 1; height: min-content; margin: 0; padding: 0; border: none;} | 44 | .boxLogo0 {grid-area: logo0; grid-column: 1 / 1; grid-row: 1 / 1; height: min-content;} |
43 | .boxLogo1 {grid-area: logo1; grid-column: 1 / 3; grid-row: 2 / 2; height: min-content; margin: 0; padding: 0; border: none;} | 45 | .boxLogo1 {grid-area: logo1; grid-column: 1 / 1; grid-row: 2 / 2; height: min-content;} |
44 | .boxHead {grid-area: head; grid-column: 2 / 4; grid-row: 1 / 1; height: min-content; margin: 0; padding: 0; border: none; text-align: right;} | 46 | |
45 | .boxTrail {grid-area: trail; grid-column: 2 / 4; grid-row: 2 / 2; height: min-content; margin: 0; padding: 0; border: none;} | 47 | .boxTrail {grid-area: trail; grid-column: 2 / 4; grid-row: 1 / 1; height: min-content;} |
48 | .boxHead {grid-area: head; grid-column: 2 / 4; grid-row: 2 / 2; height: min-content; text-align: right;} | ||
49 | |||
46 | .boxMenu {grid-area: menu; grid-column: 1 / 1; grid-row: 3 / 3; height: min-content; width: min-content; vertical-align: top; padding: 4px;} | 50 | .boxMenu {grid-area: menu; grid-column: 1 / 1; grid-row: 3 / 3; height: min-content; width: min-content; vertical-align: top; padding: 4px;} |
47 | .boxBody {grid-area: body; grid-column: 2 / 4; grid-row: 3 / 3; vertical-align: top; | 51 | .boxBody {grid-area: body; grid-column: 2 / 4; grid-row: 3 / 3; vertical-align: top; |
48 | height: 100%; width: 100%; | 52 | height: 100%; width: 100%; |
@@ -52,12 +56,16 @@ | |||
52 | .boxBody a:link {color: orange;} | 56 | .boxBody a:link {color: orange;} |
53 | .boxBody a:visited {color: $onefangGreen$;} | 57 | .boxBody a:visited {color: $onefangGreen$;} |
54 | .boxBody a:hover {color: red;} | 58 | .boxBody a:hover {color: red;} |
55 | .boxHistory {grid-area: history; grid-column: 1 / 1; grid-row: 4 / 4; height: min-content; margin: 0; padding: 0; border: none;} | 59 | |
56 | .boxFoot {grid-area: foot; grid-column: 2 / 4; grid-row: 4 / 4; height: min-content; margin: 0; padding: 0; border: none; text-align: right;} | 60 | .boxHistory {grid-area: history; grid-column: 1 / 1; grid-row: 4 / 4; height: min-content;} |
61 | .boxFoot {grid-area: foot; grid-column: 2 / 4; grid-row: 4 / 4; height: min-content; text-align: right;} | ||
62 | .boxnyaw {grid-area: foot; grid-column: 1 / 4; grid-row: 5 / 5; height: min-content; text-align: right; font-size: 0.55em;} | ||
57 | 63 | ||
58 | #modeToggleBody {display: none;} | 64 | #modeToggleBody {display: none;} |
59 | #modeToggleMenu {display: none;} | 65 | #modeToggleMenu {display: none;} |
60 | #modeBtn {color: white; display: inline-block;} | 66 | #modeBtn {color: white; display: inline-block;} |
67 | #modeToggleBody:checked ~ body background-image: linear-gradient($karenPurple$, $onefangPurple$);{} | ||
68 | #modeToggleBody:checked ~ pre {background-image: linear-gradient(to right, $onefangPurple$, $PinkFloyd$);} | ||
61 | #modeToggleBody:checked ~ .modeBtn {color: black;} | 69 | #modeToggleBody:checked ~ .modeBtn {color: black;} |
62 | #modeToggleBody:checked ~ .boxBody {background: white; color: black;} | 70 | #modeToggleBody:checked ~ .boxBody {background: white; color: black;} |
63 | #modeToggleBody:checked ~ .boxBody a:active {color: $devuanDevuanalink$;} | 71 | #modeToggleBody:checked ~ .boxBody a:active {color: $devuanDevuanalink$;} |
@@ -70,10 +78,16 @@ | |||
70 | #modeToggleMenu:checked ~ .boxMenu {display: none;} | 78 | #modeToggleMenu:checked ~ .boxMenu {display: none;} |
71 | #modeToggleMenu:checked ~ .boxHistory {display: none;} | 79 | #modeToggleMenu:checked ~ .boxHistory {display: none;} |
72 | #modeToggleMenu:checked ~ .boxFoot {display: none;} | 80 | #modeToggleMenu:checked ~ .boxFoot {display: none;} |
81 | #modeToggleMenu:checked ~ .boxnyaw {display: none;} | ||
73 | </style> | 82 | </style> |
74 | </head> | 83 | </head> |
75 | <body alink="red" link="orange" vlink="$onefangGreen$"> | 84 | <body alink="red" link="orange" vlink="$onefangGreen$"> |
76 | <div class="boxWrapper"> | 85 | <div class="boxWrapper"> |
86 | <input type="checkbox" id="modeToggleMenu"/> | ||
87 | <input type="checkbox" id="modeToggleBody"/> | ||
88 | <div class="boxLogo0"><header><nav> | ||
89 | <a href="$home$"><img src="$logo$" alt="Not (Yet) (Another / A) Wiki." title="Not (Yet) (Another / A) Wiki."/></a> | ||
90 | </nav></header></div> | ||
77 | <div class="boxLogo1"><header><nav> | 91 | <div class="boxLogo1"><header><nav> |
78 | <b class="toolTip" title="🍔 hides or shows non content. | 92 | <b class="toolTip" title="🍔 hides or shows non content. |
79 | 🕶 switches between dark and light themes. | 93 | 🕶 switches between dark and light themes. |
@@ -85,17 +99,15 @@ | |||
85 | <b class="toolTip">🪵</b> | 99 | <b class="toolTip">🪵</b> |
86 | <b class="toolTip">🔍</b> | 100 | <b class="toolTip">🔍</b> |
87 | </nav></header></div> | 101 | </nav></header></div> |
88 | <input type="checkbox" id="modeToggleMenu"/> <div class="boxMenu"><nav><p><b>$menu$</b></p></nav></div> | ||
89 | <input type="checkbox" id="modeToggleBody"/> <div class="boxBody"><main>$body$<br/></main></div> | ||
90 | <div class="boxLogo0"><header><nav> | ||
91 | <a href="$home$"><img src="$logo$" alt="Not (Yet) (Another / A) Wiki." title="Not (Yet) (Another / A) Wiki."/></a> | ||
92 | </nav></header></div> | ||
93 | <div class="boxHead"><header><nav><b>$header$</b> </nav></header></div> | ||
94 | <div class="boxTrail"><header><nav><b> 👣 $trail$ </b></nav></header></div> | 102 | <div class="boxTrail"><header><nav><b> 👣 $trail$ </b></nav></header></div> |
103 | <div class="boxHead"><header><nav><b>$header$</b> </nav></header></div> | ||
104 | <div class="boxMenu"><nav><p><b>$menu$</b></p></nav></div> | ||
105 | <div class="boxBody"><main>$body$<br/></main></div> | ||
95 | <div class="boxHistory"><footer>$history$</footer></div> | 106 | <div class="boxHistory"><footer>$history$</footer></div> |
96 | <div class="boxFoot"><footer><p>$footer$</footer> | 107 | <div class="boxFoot"><footer>$footer$</footer></div> |
97 | <p style="font-size: 0.6em;">No cookies or scripts where harmed in the making of this web site. May contain low fat CSS.</p> | 108 | <div class="boxnyaw"><footer> |
98 | </div> | 109 | <p>Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> v 0.0 No cookies or scripts where harmed in the making of this web site. May contain low fat CSS.</p> |
110 | </footer></div> | ||
99 | </div> | 111 | </div> |
100 | </body> | 112 | </body> |
101 | </html> | 113 | </html> |
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua index c337af2..f1b1565 100755 --- a/notYetAnotherWiki.lua +++ b/notYetAnotherWiki.lua | |||
@@ -28,7 +28,6 @@ local GlobalMetaData = { | |||
28 | karenPurple = '#8800ff', onefangPurple = '#cc00ff', onefangGreen = '#42ff00', | 28 | karenPurple = '#8800ff', onefangPurple = '#cc00ff', onefangGreen = '#42ff00', |
29 | PinkFloyd = '#AA00AA', DeepPurple = '#220022', -- From an ancient site of mine, which went from PinkFloyd to DeepPurple as a background gradient. | 29 | PinkFloyd = '#AA00AA', DeepPurple = '#220022', -- From an ancient site of mine, which went from PinkFloyd to DeepPurple as a background gradient. |
30 | favicon = 'nYAW_icon.png', logo = 'nYAW.png', | 30 | favicon = 'nYAW_icon.png', logo = 'nYAW.png', |
31 | footer = '<span style="font-size: 0.6em;">Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> v 0.0</span>', | ||
32 | } | 31 | } |
33 | 32 | ||
34 | local Files, Subs, xLinks = {}, {}, {} | 33 | local Files, Subs, xLinks = {}, {}, {} |
@@ -745,11 +744,11 @@ for name, file in pairs(Files) do | |||
745 | end | 744 | end |
746 | 745 | ||
747 | -- Figure out this pages footer links. | 746 | -- Figure out this pages footer links. |
748 | metadata.footer = GlobalMetaData.footer | 747 | metadata.footer = '' |
749 | if nil ~= metadata.pagehistory then metadata.history = '<p>Page <a href="' .. metadata.pagehistory .. '/' .. name .. '.md">history</a></p>' else metadata.history = '' end | 748 | if nil ~= metadata.pagehistory then metadata.history = '<p>Page <a href="' .. metadata.pagehistory .. '/' .. name .. '.md">history</a></p>' else metadata.history = '' end |
750 | if nil ~= metadata.sourcecode then metadata.footer = '<a href="' .. metadata.sourcecode .. '">source code</a> ' .. metadata.footer end | 749 | if nil ~= metadata.sourcecode then metadata.footer = '<a href="' .. metadata.sourcecode .. '">source code</a>' end |
751 | if nil ~= metadata.feedatom then metadata.footer = '<a href="' .. metadata.feedatom .. '">atom feed</a> ' .. metadata.footer end | 750 | if nil ~= metadata.feedatom then metadata.footer = '<a href="' .. metadata.feedatom .. '">atom feed</a> ' .. metadata.footer end |
752 | if metadata.footer ~= GlobalMetaData.footer then metadata.footer = 'Web site ' .. metadata.footer end | 751 | if metadata.footer ~= '' then metadata.footer = 'Web site ' .. metadata.footer end |
753 | -- Add a link to the original page. | 752 | -- Add a link to the original page. |
754 | if nil ~= metadata.ogURL then | 753 | if nil ~= metadata.ogURL then |
755 | local title, link = whichWiki(metadata) | 754 | local title, link = whichWiki(metadata) |