mirror of
https://github.com/RYGhub/royalnet.git
synced 2024-11-23 19:44:20 +00:00
OOPS WRONG BRANCH (#73)
* i guess i started something * Add minecraft server status page * Wiki style update * Add missing requirement
This commit is contained in:
parent
7331619d6d
commit
930d37d8b5
GPG key ID:
4AEE18F83AFDEB23
6 changed files with 240 additions and 32 deletions
|
|
@ -1,5 +1,5 @@
|
|||
from . import audio, bots, commands, database, network, utils, error, web
|
||||
|
||||
version = "5.0a24"
|
||||
version = "5.0a25"
|
||||
|
||||
__all__ = ["audio", "bots", "commands", "database", "network", "utils", "error", "web"]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="doublebox">
|
||||
<div class="doublebox wikiview-doublebox">
|
||||
<div class="top">
|
||||
<span class="left">
|
||||
Wiki page
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
{% if session.royal %}
|
||||
<a class="edit no-icon" href="{{ url_for("wikiedit.wikiedit_by_id", page_id=page.page_id|string, title=page.title) }}">Modifica</a>
|
||||
{% else %}
|
||||
<a class="edit no-icon faded" title="Devi fare il login per creare nuove pagine!">Modifica</a>
|
||||
<a class="edit no-icon faded" title="Devi fare il login per modificare pagine!">Modifica</a>
|
||||
{% endif %}
|
||||
|
|
||||
<a class="permalink no-icon" href="{{ url_for("wikiview.wikiview_by_id", page_id=page.page_id|string, title=page.title) }}">Permalink</a>
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ input[type="submit"],
|
|||
padding: 2px 8px;
|
||||
margin: 1px;
|
||||
font-size: medium;
|
||||
font-family: sans-serif;
|
||||
font-family: "Arial", "Helvetica Neue", sans-serif;
|
||||
text-decoration: none;
|
||||
cursor: default;
|
||||
}
|
||||
|
|
@ -186,7 +186,7 @@ input[type="email"] {
|
|||
padding: 2px;
|
||||
margin: 1px;
|
||||
font-size: medium;
|
||||
font-family: sans-serif;
|
||||
font-family: "Arial", "Helvetica Neue", sans-serif;
|
||||
}
|
||||
select {
|
||||
background-color: rgba(160, 204, 255, 0.1);
|
||||
|
|
@ -196,7 +196,7 @@ select {
|
|||
padding: 2px;
|
||||
margin: 1px;
|
||||
font-size: medium;
|
||||
font-family: sans-serif;
|
||||
font-family: "Arial", "Helvetica Neue", sans-serif;
|
||||
}
|
||||
select option {
|
||||
background-color: #293c61;
|
||||
|
|
@ -237,6 +237,53 @@ nav .nav-sitename {
|
|||
nav .nav-login-unavailable {
|
||||
opacity: 0.25;
|
||||
}
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
table thead {
|
||||
margin-top: 4px;
|
||||
margin-left: 4px;
|
||||
margin-right: 4px;
|
||||
padding: 8px;
|
||||
}
|
||||
table thead th {
|
||||
background-color: rgba(160, 204, 255, 0.2);
|
||||
color: #ffffff;
|
||||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
text-align: left;
|
||||
font-size: small;
|
||||
font-weight: bold;
|
||||
}
|
||||
table thead tr:first-child th:first-child {
|
||||
border-radius: 4px 0 0 0;
|
||||
}
|
||||
table thead tr:first-child th:last-child {
|
||||
border-radius: 0 4px 0 0;
|
||||
}
|
||||
table tbody {
|
||||
margin-bottom: 4px;
|
||||
margin-left: 4px;
|
||||
margin-right: 4px;
|
||||
padding: 8px;
|
||||
}
|
||||
table tbody td {
|
||||
background-color: rgba(160, 204, 255, 0.1);
|
||||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
}
|
||||
table tbody tr {
|
||||
border-bottom: 1px solid rgba(160, 204, 255, 0.2);
|
||||
}
|
||||
table tbody tr:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
table tbody tr:last-child td:first-child {
|
||||
border-radius: 0 0 0 4px;
|
||||
}
|
||||
table tbody tr:last-child td:last-child {
|
||||
border-radius: 0 0 4px 0;
|
||||
}
|
||||
.h-container {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
|
@ -422,9 +469,10 @@ nav .nav-login-unavailable {
|
|||
font-size: xx-large;
|
||||
}
|
||||
.spoiler {
|
||||
color: rgba(0, 0, 0, 0);
|
||||
color: transparent;
|
||||
border: 1px solid rgba(160, 204, 255, 0.1);
|
||||
border-radius: 2px;
|
||||
padding: 4px;
|
||||
}
|
||||
.spoiler:hover {
|
||||
color: #a0ccff;
|
||||
|
|
@ -454,7 +502,7 @@ button[disabled=""] {
|
|||
}
|
||||
.wikiedit-form .editor-toolbar,
|
||||
.wikiedit-form .editor-statusbar {
|
||||
background-color: #2a3d62;
|
||||
background-color: #0e1c47;
|
||||
color: #a0ccff !important;
|
||||
border: 0;
|
||||
opacity: 1 !important;
|
||||
|
|
@ -508,7 +556,7 @@ button[disabled=""] {
|
|||
color: #7dff7d !important;
|
||||
}
|
||||
.wikiedit-form .CodeMirror .cm-comment {
|
||||
color: #ff7d7d !important;
|
||||
color: lightgray !important;
|
||||
}
|
||||
.wikiedit-form .CodeMirror .cm-header {
|
||||
color: #ffffff !important;
|
||||
|
|
@ -557,4 +605,48 @@ button[disabled=""] {
|
|||
justify-self: end;
|
||||
grid-row: 2;
|
||||
}
|
||||
|
||||
.wikiview-doublebox .bot {
|
||||
background-color: transparent;
|
||||
border-top: 0;
|
||||
border-bottom: 4px solid rgba(160, 204, 255, 0.2);
|
||||
border-left: 4px solid rgba(160, 204, 255, 0.2);
|
||||
border-right: 4px solid rgba(160, 204, 255, 0.2);
|
||||
}
|
||||
.wikiview-doublebox .bot .wikiview-title {
|
||||
text-align: center;
|
||||
font-size: 42px;
|
||||
margin-top: 0;
|
||||
}
|
||||
.wikiview-doublebox .bot h1,
|
||||
.wikiview-doublebox .bot h2,
|
||||
.wikiview-doublebox .bot h3,
|
||||
.wikiview-doublebox .bot h4,
|
||||
.wikiview-doublebox .bot h5,
|
||||
.wikiview-doublebox .bot h6 {
|
||||
margin-top: revert;
|
||||
margin-bottom: revert;
|
||||
}
|
||||
.wikiview-doublebox .bot blockquote {
|
||||
color: #7dff7d;
|
||||
border-left: 3px solid #7dff7d;
|
||||
background-color: rgba(125, 255, 125, 0.1);
|
||||
}
|
||||
.wikiview-doublebox .bot blockquote.spoiler {
|
||||
color: transparent;
|
||||
background-color: rgba(255, 125, 125, 0.1);
|
||||
border: 1px solid rgba(255, 125, 125, 0.1);
|
||||
border-radius: 2px;
|
||||
padding: 4px;
|
||||
}
|
||||
.wikiview-doublebox .bot blockquote.spoiler:hover {
|
||||
color: #ff7d7d;
|
||||
}
|
||||
.wikiview-doublebox .bot pre {
|
||||
color: lightgray;
|
||||
border: 1px solid rgba(160, 204, 255, 0.1);
|
||||
background-color: rgba(160, 204, 255, 0.1);
|
||||
padding: 2px 4px 2px 8px;
|
||||
margin: 8px;
|
||||
}
|
||||
/*# sourceMappingURL=ryg.css.map */
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -3,6 +3,12 @@
|
|||
@li: #00caca; //Link
|
||||
@ec: #ffffff; //Extra color
|
||||
|
||||
@fg-ten: fade(@fg, 10%);
|
||||
@fg-twenty: fade(@fg, 20%);
|
||||
|
||||
@fg-ten-hard: overlay(@bg, @fg-ten);
|
||||
@fg-twenty-hard: overlay(@bg, @fg-twenty);
|
||||
|
||||
@pastel-red: #ff7d7d;
|
||||
@pastel-orange: #ffbb7d;
|
||||
@pastel-yellow: #ffff7d;
|
||||
|
|
@ -173,13 +179,13 @@ code {
|
|||
blockquote {
|
||||
color: @fg;
|
||||
border-left: 3px solid @fg;
|
||||
background-color: fade(@fg, 10%);
|
||||
background-color: @fg-ten;
|
||||
padding: 2px 4px 2px 8px;
|
||||
margin: 8px;
|
||||
}
|
||||
|
||||
textarea {
|
||||
background-color: fade(@fg, 10%);
|
||||
background-color: @fg-ten;
|
||||
color: @fg;
|
||||
border: 1px solid @fg;
|
||||
padding: 2px;
|
||||
|
|
@ -191,19 +197,19 @@ textarea {
|
|||
}
|
||||
|
||||
button, input[type="submit"], .btn {
|
||||
background-color: fade(@fg, 10%);
|
||||
background-color: @fg-ten;
|
||||
color: @fg !important;
|
||||
border: 1px solid @fg;
|
||||
border-radius: 0;
|
||||
padding: 2px 8px;
|
||||
margin: 1px;
|
||||
font-size: medium;
|
||||
font-family: sans-serif;
|
||||
font-family: @main-fonts;
|
||||
text-decoration: none;
|
||||
cursor: default;
|
||||
|
||||
&:hover {
|
||||
background-color: fade(@fg, 20%);
|
||||
background-color: @fg-twenty;
|
||||
color: lighten(@fg, 25%);
|
||||
border-color: lighten(@fg, 25%);
|
||||
}
|
||||
|
|
@ -216,25 +222,25 @@ button, input[type="submit"], .btn {
|
|||
}
|
||||
|
||||
input[type="text"], input[type="password"], input[type="email"] {
|
||||
background-color: fade(@fg, 10%);
|
||||
background-color: @fg-ten;
|
||||
color: @fg;
|
||||
border: none;
|
||||
border-bottom: 1px dashed @fg;
|
||||
padding: 2px;
|
||||
margin: 1px;
|
||||
font-size: medium;
|
||||
font-family: sans-serif;
|
||||
font-family: @main-fonts;
|
||||
}
|
||||
|
||||
select {
|
||||
background-color: fade(@fg, 10%);
|
||||
background-color: @fg-ten;
|
||||
color: @fg;
|
||||
border: none;
|
||||
border-bottom: 1px dotted @fg;
|
||||
padding: 2px;
|
||||
margin: 1px;
|
||||
font-size: medium;
|
||||
font-family: sans-serif;
|
||||
font-family: @main-fonts;
|
||||
|
||||
option {
|
||||
background-color: #293c61;
|
||||
|
|
@ -286,6 +292,67 @@ nav {
|
|||
}
|
||||
}
|
||||
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
|
||||
thead {
|
||||
margin-top: 4px;
|
||||
margin-left: 4px;
|
||||
margin-right: 4px;
|
||||
padding: 8px;
|
||||
|
||||
th {
|
||||
background-color: @fg-twenty;
|
||||
color: @ec;
|
||||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
text-align: left;
|
||||
font-size: small;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
tr:first-child {
|
||||
th:first-child {
|
||||
border-radius: 4px 0 0 0;
|
||||
}
|
||||
|
||||
th:last-child {
|
||||
border-radius: 0 4px 0 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tbody {
|
||||
margin-bottom: 4px;
|
||||
margin-left: 4px;
|
||||
margin-right: 4px;
|
||||
padding: 8px;
|
||||
|
||||
td {
|
||||
background-color: @fg-ten;
|
||||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
}
|
||||
|
||||
tr {
|
||||
border-bottom: 1px solid @fg-twenty;
|
||||
|
||||
&:last-child {
|
||||
border-bottom: none;
|
||||
|
||||
td:first-child {
|
||||
border-radius: 0 0 0 4px;
|
||||
}
|
||||
|
||||
td:last-child {
|
||||
border-radius: 0 0 4px 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Elements
|
||||
|
||||
.h-container {
|
||||
|
|
@ -315,7 +382,7 @@ nav {
|
|||
}
|
||||
|
||||
.box {
|
||||
background-color: fade(@fg, 10%);
|
||||
background-color: @fg-ten;
|
||||
border-radius: 4px;
|
||||
padding: 8px;
|
||||
margin: 8px;
|
||||
|
|
@ -327,7 +394,7 @@ nav {
|
|||
.top {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
background-color: fade(@fg, 20%);
|
||||
background-color: @fg-twenty;
|
||||
padding: 4px;
|
||||
border-radius: 4px 4px 0 0;
|
||||
color: @ec;
|
||||
|
|
@ -345,7 +412,7 @@ nav {
|
|||
}
|
||||
|
||||
.bot {
|
||||
background-color: fade(@fg, 10%);
|
||||
background-color: @fg-ten;
|
||||
padding: 8px;
|
||||
border-radius: 0 0 4px 4px;
|
||||
}
|
||||
|
|
@ -496,7 +563,7 @@ nav {
|
|||
|
||||
&:not(.plus):not(.minus):not(.stars) {
|
||||
color: @fg;
|
||||
background-color: fade(@fg, 10%);
|
||||
background-color: @fg-ten;
|
||||
|
||||
&::before {
|
||||
font-family: "Font Awesome 5 Free";
|
||||
|
|
@ -512,9 +579,10 @@ nav {
|
|||
}
|
||||
|
||||
.spoiler {
|
||||
color: rgba(0, 0, 0, 0);
|
||||
border: 1px solid fade(@fg, 10%);
|
||||
color: transparent;
|
||||
border: 1px solid @fg-ten;
|
||||
border-radius: 2px;
|
||||
padding: 4px;
|
||||
|
||||
&:hover {
|
||||
color: @fg;
|
||||
|
|
@ -551,7 +619,7 @@ nav {
|
|||
}
|
||||
|
||||
.editor-toolbar, .editor-statusbar {
|
||||
background-color: #2a3d62;
|
||||
background-color: @fg-twenty-hard;
|
||||
color: @fg !important;
|
||||
border: 0;
|
||||
opacity: 1 !important;
|
||||
|
|
@ -561,7 +629,7 @@ nav {
|
|||
border: 0;
|
||||
|
||||
&:hover {
|
||||
background-color: fade(@fg, 20%);
|
||||
background-color: @fg-twenty;
|
||||
color: lighten(@fg, 25%) !important;
|
||||
}
|
||||
|
||||
|
|
@ -570,7 +638,7 @@ nav {
|
|||
color: white !important;
|
||||
|
||||
&:hover {
|
||||
background-color: fade(@fg, 20%);
|
||||
background-color: @fg-twenty;
|
||||
color: lighten(@fg, 25%) !important;
|
||||
}
|
||||
}
|
||||
|
|
@ -583,8 +651,8 @@ nav {
|
|||
color: @fg;
|
||||
border-top: 0;
|
||||
border-bottom: 0;
|
||||
border-left: 1px solid fade(@fg, 20%);
|
||||
border-right: 1px solid fade(@fg, 20%);
|
||||
border-left: 1px solid @fg-twenty;
|
||||
border-right: 1px solid @fg-twenty;
|
||||
border-radius: 0;
|
||||
|
||||
.cm-link {
|
||||
|
|
@ -612,7 +680,7 @@ nav {
|
|||
}
|
||||
|
||||
.cm-comment {
|
||||
color: @pastel-red !important;
|
||||
color: lightgray !important;
|
||||
}
|
||||
|
||||
.cm-header {
|
||||
|
|
@ -677,3 +745,50 @@ nav {
|
|||
grid-row: 2;
|
||||
}
|
||||
}
|
||||
|
||||
.wikiview-doublebox {
|
||||
.bot {
|
||||
background-color: transparent;
|
||||
border-top: 0;
|
||||
border-bottom: 4px solid @fg-twenty;
|
||||
border-left: 4px solid @fg-twenty;
|
||||
border-right: 4px solid @fg-twenty;
|
||||
|
||||
.wikiview-title {
|
||||
text-align: center;
|
||||
font-size: 42px;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin-top: revert;
|
||||
margin-bottom: revert;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
color: @pastel-lime;
|
||||
border-left: 3px solid @pastel-lime;
|
||||
background-color: fade(@pastel-lime, 10%);
|
||||
|
||||
&.spoiler {
|
||||
color: transparent;
|
||||
background-color: fade(@pastel-red, 10%);
|
||||
border: 1px solid fade(@pastel-red, 10%);
|
||||
border-radius: 2px;
|
||||
padding: 4px;
|
||||
|
||||
&:hover {
|
||||
color: @pastel-red;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pre {
|
||||
color: lightgray;
|
||||
border: 1px solid @fg-ten;
|
||||
background-color: @fg-ten;
|
||||
padding: 2px 4px 2px 8px;
|
||||
margin: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
3
setup.py
3
setup.py
|
|
@ -27,7 +27,8 @@ setuptools.setup(
|
|||
"PyNaCl>=1.3.0",
|
||||
"werkzeug>=0.15.4",
|
||||
"flask>=1.0.3",
|
||||
"markdown2>=2.3.8"],
|
||||
"markdown2>=2.3.8",
|
||||
"mcstatus>=2.2.1"],
|
||||
python_requires=">=3.7",
|
||||
classifiers=[
|
||||
"Development Status :: 3 - Alpha",
|
||||
|
|
|
|||
Loading…
Reference in a new issue