diff --git a/client/assets/discord.svg b/client/assets/discord.svg new file mode 100644 index 00000000..fcaa2211 --- /dev/null +++ b/client/assets/discord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/assets/discord.white.svg b/client/assets/discord.white.svg new file mode 100644 index 00000000..22dd1136 --- /dev/null +++ b/client/assets/discord.white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/assets/styles/controls.less b/client/assets/styles/controls.less index 1d52b4c1..a9fc250d 100644 --- a/client/assets/styles/controls.less +++ b/client/assets/styles/controls.less @@ -26,6 +26,12 @@ aside { grid-gap: 0.5em 0; } + &.play-ctrl { + .controls { + grid-template-rows: 4fr 4fr 1fr; + } + } + // fix chrome being inconsistent table { height: 100%; diff --git a/client/assets/styles/menu.less b/client/assets/styles/menu.less index 03a2334c..60f0a7de 100644 --- a/client/assets/styles/menu.less +++ b/client/assets/styles/menu.less @@ -64,10 +64,18 @@ .options { grid-area: hdr; + display: flex; + + .logo { + flex: 0 1 10%; + margin-right: 1em; + border: none; + } + button { - width: 25%; + flex: 1; border-top: 0; - border: 1px solid #222; + border: 2px solid #222; &:not(:last-child) { border-right: 0; } @@ -81,7 +89,6 @@ .login { display: flex; flex-flow: column; - margin-bottom: 2em; } } diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index c2119868..66bdb2cd 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -236,12 +236,13 @@ figure.gray { header { .options { - font-size: 250%; + font-size: 200%; } button { height: 2em; // border-radius: 0.1em; + border: none; border-radius: 0; } } @@ -254,8 +255,7 @@ header { border: 0; } - border: 1px solid #444; - flex: 1; + border: none; } } @@ -273,9 +273,16 @@ li { } .logo { + height: 2em; background-image: url("../../src/components/svgs/mnml.2.svg"); background-size: contain; background-repeat: no-repeat; + background-position: left; +} + +.discord-btn { + background-image: url("./../discord.white.svg"); + background-size: contain; + background-repeat: no-repeat; background-position: center; } - diff --git a/client/src/components/header.jsx b/client/src/components/header.jsx index 4f78e9fe..9bb8d9e0 100644 --- a/client/src/components/header.jsx +++ b/client/src/components/header.jsx @@ -75,9 +75,14 @@ function Header(args) {
+ +
); diff --git a/client/src/components/svgs/mnml.4.svg b/client/src/components/svgs/mnml.4.svg new file mode 100644 index 00000000..801d6215 --- /dev/null +++ b/client/src/components/svgs/mnml.4.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + mnml.gg + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/src/components/svgs/mnml.plain.svg b/client/src/components/svgs/mnml.plain.svg new file mode 100644 index 00000000..65379683 --- /dev/null +++ b/client/src/components/svgs/mnml.plain.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + mnml.gg + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/src/components/welcome.jsx b/client/src/components/welcome.jsx index 80ce32a5..a9cd4c53 100644 --- a/client/src/components/welcome.jsx +++ b/client/src/components/welcome.jsx @@ -4,7 +4,7 @@ const preact = require('preact'); const Login = require('./welcome.login'); const Register = require('./welcome.register'); const Help = require('./welcome.help'); -const About = require('./welcome.about'); +// const About = require('./welcome.about'); const Demo = require('./demo'); function Welcome() { @@ -14,7 +14,6 @@ function Welcome() { const pageEl = () => { if (page === 'login') return ; if (page === 'register') return ; - if (page === 'about') return ; if (page === 'help') return ; return false; }; @@ -23,6 +22,11 @@ function Welcome() {
+ -