diff --git a/tools/devel-server.py b/tools/devel-server.py index 830eb9f..3d66ddc 100755 --- a/tools/devel-server.py +++ b/tools/devel-server.py @@ -45,7 +45,7 @@ class Page: ret.write("\n") ret.write(" \n") ret.write(" {}\n".format(self.title)) - ret.write(" \n".format(self.base)) + ret.write(" \n".format(self.base)) for s in self.scripts: ret.write(" {}\n".format(s)) ret.write(" \n") diff --git a/tools/mothballer.py b/tools/mothballer.py index 5b368ab..8166f74 100755 --- a/tools/mothballer.py +++ b/tools/mothballer.py @@ -61,7 +61,7 @@ def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files {category} {points} - + {scripts} diff --git a/www/cgi-bin/koth.lua b/www/cgi-bin/koth.lua index ceb7742..1e1e792 100644 --- a/www/cgi-bin/koth.lua +++ b/www/cgi-bin/koth.lua @@ -33,7 +33,7 @@ function koth.page(title, body) print() end print("") - print("" .. title .. "") + print("" .. title .. "") print("

" .. title .. "

") if (body) then print("
") diff --git a/www/css/style-legacy.css b/www/css/style-legacy.css new file mode 100644 index 0000000..53198f2 --- /dev/null +++ b/www/css/style-legacy.css @@ -0,0 +1,85 @@ +html { + color: #ccb; + height: 100%; +} + +body { + margin: 0; + height: 100% +} + +pre, tt { + background-color: rgba(0, 0, 0, 0.3); +} + +.terminal { + background: rgba(80, 70, 60, 0.96); + display: inline-block; + margin: 1%; + border: solid black 0.2em; + border-radius: 1em 1em 0.5em 1em; + overflow: auto; +} + +.terminal p { + padding: 0.25em 0.5em; +} + +#overview, #messages { + width: 47%; + height: 20%; +} + +#puzzles { + width: 24%; + height: 70%; +} + +#main { + width: 70%; + height: 70%; +} + +.download { + background: #080; + color: white; + display: inline-block; +} +.download:link { + color: inherit; + text-decoration: inherit; +} + +h1 { + text-align: center; + font-size: 120%; +} + +a:link, .link { + color: #13a5de; + cursor: pointer; +} + +a:visited { + color: #999999; +} + +@media (max-width: 52em) { + #overview, #messages, #puzzles, #main { + width: 96%; + } +} + +::-webkit-scrollbar { + width: 0.7em; +} + +::-webkit-scrollbar-track { + /* -webkit-box-shadow: inset 0 0 0.5em rgba(200, 200, 200, 0.3); */ + background: rgba(0, 0, 0, 0.2); +} + +::-webkit-scrollbar-thumb { + background: rgba(255, 255, 255, 0.2); + border-radius: 1em; +} diff --git a/www/css/style.css b/www/css/style.css index b4c2035..b1e156f 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -9,14 +9,13 @@ Tan: #e1caa5 @import "../fonts/maven_pro.css"; html { - background: #35170c url(../images/background.png) no-repeat center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; -/* min-height: 100%;*/ - font-family: "Maven Pro", Ubuntu, sans-serif; - overflow-y: auto; + background: #35170c url(../images/background.png) no-repeat center center fixed; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; + font-family: "Maven Pro", Ubuntu, sans-serif; + overflow-y: auto; } h1, h2, h3 { @@ -259,3 +258,36 @@ nav li + li:before { font-size: small; text-align: center; } + +#puzzles { + width: 24%; + height: 20%; +} + +.category h2 { + margin: 0; + font-size: 100%; +} + +.category ul { + margin: 0; + padding-left: 1em; + font-size: 90%; +} + +.category li { + display: inline; +} + +.category li + li:before { + content: " "; +} + +.category a:link, .link { + color: #13a5de; + cursor: pointer; +} + +.category a:visited { + color: #999999; +} diff --git a/www/fancypants.html b/www/fancypants.html index 522ab9f..413f629 100644 --- a/www/fancypants.html +++ b/www/fancypants.html @@ -3,6 +3,7 @@ + diff --git a/www/puzzles-notoken.html b/www/puzzles-notoken.html index 1a7d4f1..5429248 100644 --- a/www/puzzles-notoken.html +++ b/www/puzzles-notoken.html @@ -4,7 +4,7 @@ Open Puzzles - + diff --git a/www/res/Inconsolata-Bold.ttf b/www/res/Inconsolata-Bold.ttf deleted file mode 100644 index 035d579..0000000 Binary files a/www/res/Inconsolata-Bold.ttf and /dev/null differ diff --git a/www/res/Inconsolata-Regular.ttf b/www/res/Inconsolata-Regular.ttf deleted file mode 100644 index bbc9647..0000000 Binary files a/www/res/Inconsolata-Regular.ttf and /dev/null differ diff --git a/www/res/Lato-Black.ttf b/www/res/Lato-Black.ttf deleted file mode 100644 index 6848db0..0000000 Binary files a/www/res/Lato-Black.ttf and /dev/null differ diff --git a/www/res/Lato-BlackItalic.ttf b/www/res/Lato-BlackItalic.ttf deleted file mode 100644 index 5decf12..0000000 Binary files a/www/res/Lato-BlackItalic.ttf and /dev/null differ diff --git a/www/res/Lato-Bold.ttf b/www/res/Lato-Bold.ttf deleted file mode 100644 index 7434369..0000000 Binary files a/www/res/Lato-Bold.ttf and /dev/null differ diff --git a/www/res/Lato-BoldItalic.ttf b/www/res/Lato-BoldItalic.ttf deleted file mode 100644 index 684aacf..0000000 Binary files a/www/res/Lato-BoldItalic.ttf and /dev/null differ diff --git a/www/res/Lato-Hairline.ttf b/www/res/Lato-Hairline.ttf deleted file mode 100644 index 288be29..0000000 Binary files a/www/res/Lato-Hairline.ttf and /dev/null differ diff --git a/www/res/Lato-HairlineItalic.ttf b/www/res/Lato-HairlineItalic.ttf deleted file mode 100644 index c2bfd33..0000000 Binary files a/www/res/Lato-HairlineItalic.ttf and /dev/null differ diff --git a/www/res/Lato-Italic.ttf b/www/res/Lato-Italic.ttf deleted file mode 100644 index 3d3b7a2..0000000 Binary files a/www/res/Lato-Italic.ttf and /dev/null differ diff --git a/www/res/Lato-Light.ttf b/www/res/Lato-Light.ttf deleted file mode 100644 index a958067..0000000 Binary files a/www/res/Lato-Light.ttf and /dev/null differ diff --git a/www/res/Lato-LightItalic.ttf b/www/res/Lato-LightItalic.ttf deleted file mode 100644 index 5e45ad9..0000000 Binary files a/www/res/Lato-LightItalic.ttf and /dev/null differ diff --git a/www/res/Lato-Regular.ttf b/www/res/Lato-Regular.ttf deleted file mode 100644 index 04ea8ef..0000000 Binary files a/www/res/Lato-Regular.ttf and /dev/null differ diff --git a/www/res/Lato.css b/www/res/Lato.css deleted file mode 100644 index da5b5db..0000000 --- a/www/res/Lato.css +++ /dev/null @@ -1,18 +0,0 @@ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: local('Lato Regular'), local('Lato-Regular'), url(Lato-Regular.ttf) format('truetype'); -} -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 700; - src: local('Lato Bold'), local('Lato-Bold'), url(Lato-Bold.ttf) format('truetype'); -} -@font-face { - font-family: 'Lato'; - font-style: italic; - font-weight: 400; - src: local('Lato Italic'), local('Lato-Italic'), url(Lato-Italic.ttf) format('truetype'); -} diff --git a/www/res/brown-lines.jpg b/www/res/brown-lines.jpg deleted file mode 100644 index 63d30ac..0000000 Binary files a/www/res/brown-lines.jpg and /dev/null differ diff --git a/www/res/preview.png b/www/res/preview.png deleted file mode 100644 index 396a9c8..0000000 Binary files a/www/res/preview.png and /dev/null differ diff --git a/www/res/style.css b/www/res/style.css deleted file mode 100644 index 14f11e9..0000000 --- a/www/res/style.css +++ /dev/null @@ -1,139 +0,0 @@ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: local('Lato Regular'), local('Lato-Regular'), url(Lato-Regular.ttf) format('truetype'); -} -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 700; - src: local('Lato Bold'), local('Lato-Bold'), url(Lato-Bold.ttf) format('truetype'); -} -@font-face { - font-family: 'Lato'; - font-style: italic; - font-weight: 400; - src: local('Lato Italic'), local('Lato-Italic'), url(Lato-Italic.ttf) format('truetype'); -} -@font-face { - font-family: 'Inconsolata'; - font-style: normal; - font-weight: 400; - src: local('Inconsolata Regular'), local('Inconsolata-Regular'), url(Inconsolata-Regular.ttf) format('truetype'); -} - - -html { - background: rgba(61, 50, 44, 0) url(brown-lines.jpg) no-repeat center center fixed; - background-size: cover; - color: #ccb; - height: 100%; - font-family: Lato, sans-serif; -} - -body { - margin: 0; - height: 100% -} - -pre, tt { - font-family: Inconsolata, monospace; - background-color: rgba(0, 0, 0, 0.3); -} - -.terminal { - background: rgba(80, 70, 60, 0.96); - display: inline-block; - margin: 1%; - border: solid black 0.2em; - border-radius: 1em 1em 0.5em 1em; - overflow: auto; -} - -.terminal p { - padding: 0.25em 0.5em; -} - -#preview { - background-image: url(preview.png); - background-size: contain; - max-width: 40em; - display: block; - margin: 1% auto; -} - -#overview, #messages { - width: 47%; - height: 20%; -} - -#puzzles { - width: 24%; - height: 70%; -} - -#main { - width: 70%; - height: 70%; -} - -.download { - background: #080; - color: white; - display: inline-block; -} -.download:link { - color: inherit; - text-decoration: inherit; -} - -h1 { - text-align: center; - font-size: 120%; -} - -a:link, .link { - color: #13a5de; - cursor: pointer; -} - -a:visited { - color: #999999; -} - -.category h2 { - margin: 0; - font-size: 100%; -} -.category ul { - margin: 0; - padding-left: 1em; - font-size: 90%; -} -.category li { - display: inline; -} -.category li + li:before { - content: " "; -} - -@media (max-width: 52em) { - #overview, #messages, #puzzles, #main { - width: 96%; - } -} - -::-webkit-scrollbar { - width: 0.7em; -} - -::-webkit-scrollbar-track { - /* -webkit-box-shadow: inset 0 0 0.5em rgba(200, 200, 200, 0.3); */ - background: rgba(0, 0, 0, 0.2); -} - -::-webkit-scrollbar-thumb { - background: rgba(255, 255, 255, 0.2); - border-radius: 1em; -}