diff --git a/extra/webapps/pastebin/pastebin-common.xml b/extra/webapps/pastebin/pastebin-common.xml index 44d0859875..04ab572e29 100644 --- a/extra/webapps/pastebin/pastebin-common.xml +++ b/extra/webapps/pastebin/pastebin-common.xml @@ -7,7 +7,6 @@

diff --git a/extra/webapps/planet/planet-common.xml b/extra/webapps/planet/planet-common.xml index bb8aafd874..0881938539 100644 --- a/extra/webapps/planet/planet-common.xml +++ b/extra/webapps/planet/planet-common.xml @@ -5,7 +5,6 @@

diff --git a/extra/webapps/todo/todo.xml b/extra/webapps/todo/todo.xml index d74e93972d..32101ebd24 100644 --- a/extra/webapps/todo/todo.xml +++ b/extra/webapps/todo/todo.xml @@ -11,7 +11,6 @@

diff --git a/extra/webapps/wiki/page-common.xml b/extra/webapps/wiki/page-common.xml index 42291693cf..df9da4b9c7 100644 --- a/extra/webapps/wiki/page-common.xml +++ b/extra/webapps/wiki/page-common.xml @@ -9,12 +9,10 @@ diff --git a/extra/webapps/wiki/wiki-common.xml b/extra/webapps/wiki/wiki-common.xml index f8a1820ed6..422d79d199 100644 --- a/extra/webapps/wiki/wiki-common.xml +++ b/extra/webapps/wiki/wiki-common.xml @@ -11,9 +11,9 @@

- - + +

@@ -32,8 +32,6 @@

-
- @@ -52,8 +50,6 @@ Logout - -

diff --git a/extra/webapps/wiki/wiki-contents.css b/extra/webapps/wiki/wiki-contents.css deleted file mode 100644 index 111a153164..0000000000 --- a/extra/webapps/wiki/wiki-contents.css +++ /dev/null @@ -1,76 +0,0 @@ -#left { - float: left; - width: 200px; - z-index: 99; - border-right: 1px solid #ccc; - background: #f3f2ea; -} - -#right { - margin-left: 200px; - width: calc(100% - 200px); -} - -nav img { - margin: -15px; - margin-top: -19px; - margin-right: 0px; - padding: 15px; - padding-top: 13px; - padding-bottom: 11px; - vertical-align: middle; - display: none; -} - -.navrow { - left: 0; -} - -.page { - max-width: 800px; - left: 0; -} - -.page nav { - position: relative; - width: calc(100vw - 200px); - left: 0; -} - -@media screen and (max-width: 600px) { - #left { - position: absolute; - margin-top: 32px; - display: none; - } - - #right { - margin-left: 0; - width: 100vw; - } - - nav img { - display: inline; - } - - .page nav { - width: 100vw; - } -} - - -/* Dark mode / -@media (prefers-color-scheme: dark) { - nav img { - filter: invert(80%); - } - - #left { - background-color: #373e48; - border-right: 1px solid #666; - } - - .description pre { - color: black; - } -} diff --git a/extra/webapps/wiki/wiki-contents.js b/extra/webapps/wiki/wiki-contents.js deleted file mode 100644 index 80112a9358..0000000000 --- a/extra/webapps/wiki/wiki-contents.js +++ /dev/null @@ -1,14 +0,0 @@ -function toggleSidebar() { - var l = document.getElementById("left"); - var m = document.getElementById("menu"); - if (l.style.display === "") { - l.style.display = "inline"; - var darkMode = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches; - if (!darkMode) { - m.style.backgroundColor = "#f3f2ea"; - } - } else { - l.style.display = ""; - m.style.backgroundColor = ""; - } -} diff --git a/extra/webapps/wiki/wiki.css b/extra/webapps/wiki/wiki.css index 7a3429cb55..1337974a1b 100644 --- a/extra/webapps/wiki/wiki.css +++ b/extra/webapps/wiki/wiki.css @@ -115,3 +115,76 @@ footer { padding-left: 15px; font-size: smaller; } + +#left { + float: left; + width: 200px; + z-index: 99; + border-right: 1px solid #ccc; + background: #f3f2ea; +} + +#right { + margin-left: 200px; + width: calc(100% - 200px); +} + +nav img { + margin: -15px; + margin-top: -19px; + margin-right: 0px; + padding: 15px; + padding-top: 13px; + padding-bottom: 11px; + vertical-align: middle; + display: none; +} + +.page { + max-width: 800px; + left: 0; +} + +.page nav { + position: relative; + width: calc(100vw - 200px); + left: 0; +} + +@media screen and (max-width: 600px) { + #left { + position: absolute; + margin-top: 32px; + display: none; + } + + #right { + margin-left: 0; + width: 100vw; + } + + nav img { + display: inline; + } + + .page nav { + width: 100vw; + } +} + + +/ Dark mode */ +@media (prefers-color-scheme: dark) { + nav img { + filter: invert(80%); + } + + #left { + background-color: #373e48; + border-right: 1px solid #666; + } + + .description pre { + color: black; + } +} diff --git a/extra/websites/concatenative/page.css b/extra/websites/concatenative/page.css index c420456f7a..1513ab1989 100644 --- a/extra/websites/concatenative/page.css +++ b/extra/websites/concatenative/page.css @@ -6,8 +6,9 @@ html { box-sizing: inherit; } -body { +html, body { margin: 0; + padding: 0; } body, button { @@ -55,21 +56,15 @@ a:hover, .link:hover { text-decoration: underline; } nav { border-bottom: 1px solid #ccc; background-color: #f5f5f5; + padding: 15px; + padding-left: calc(max(50% - 500px, 15px)); } -.navrow { - max-width: 1000px; - position: relative; - left: calc(max(-500px,-50%) + 50%); - margin: 0; - padding: 10px 15px 10px 15px; -} - -.navrow a, .navrow .link { - margin-right: 10px; +nav a, nav .link { + margin-right: 5px; } -.navrow img { +nav img { vertical-align: middle; }