diff --git a/WORKLOG.md b/WORKLOG.md index bc56173d..5d23e2e2 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -11,6 +11,10 @@ * constructs jiggle when clicked * background colour changes depending on time of day + * other + * skill pane bigger + * add colours and speed -> Skill > B + * bot game grind * change score to enum diff --git a/bin/deploy.sh b/bin/deploy.sh index 15778cd7..0c9362f1 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -6,7 +6,6 @@ MNML_PATH=$(realpath "$DIR/../") VERSION=$(<"$MNML_PATH/VERSION") SERVER_BIN_DIR="/usr/local/mnml/bin" - CLIENT_DIST_DIR="/var/lib/mnml/client" CLIENT_PUBLIC_DIR="/var/lib/mnml/public/current" diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less index d9c5a195..21d5b885 100644 --- a/client/assets/styles/instance.less +++ b/client/assets/styles/instance.less @@ -3,7 +3,7 @@ .instance { overflow-x: hidden; display: grid; - grid-template-columns: 2fr minmax(min-content, 1fr); + grid-template-columns: 1fr minmax(min-content, 1fr); grid-template-rows: min-content 1fr; grid-template-areas: diff --git a/client/assets/styles/menu.less b/client/assets/styles/menu.less index fb919124..acb680a1 100644 --- a/client/assets/styles/menu.less +++ b/client/assets/styles/menu.less @@ -4,11 +4,12 @@ height: 100%; display: grid; - grid-template-rows: minmax(min-content, 2fr) 1fr; + grid-template-rows: minmax(min-content, 2fr) min-content 1fr; grid-template-columns: 1fr; grid-template-areas: "top" + "tabs" "bottom"; .top { @@ -63,7 +64,6 @@ .inventory { margin-top: 2em; grid-area: bottom; - display: grid; grid-template-columns: 1fr 1fr; @@ -87,4 +87,18 @@ flex-flow: column; } } + + .options { + grid-area: tabs; + display: flex; + flex-flow: row; + button { + border-top: 0; + border: 1px solid #222; + &:not(:last-child) { + border-right: 0; + } + flex: 1; + } + } } diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index 30b6d8e1..e678e581 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -88,8 +88,8 @@ dl { grid-template-rows: min-content 1fr min-content; grid-template-areas: "hd hd ctrl" - "nav main ctrl" - "nav main ctrl"; + "main main ctrl" + "main main ctrl"; } main { @@ -198,12 +198,6 @@ button[disabled] { */ .welcome { - .highlight { - color: black; - background: @white; - border: 1px solid @white; - } - .login { width: 50%; display: flex; @@ -213,11 +207,6 @@ button[disabled] { .options { width: 50%; - display: flex; - flex-flow: row; - button { - flex: 1; - } } h2 { @@ -262,4 +251,32 @@ figure.gray { .mobile-title { display: none; -} \ No newline at end of file +} + +.options { + display: flex; + flex-flow: row; + + button { + &.highlight { + color: @white; + box-shadow: inset 0px 5px 0px 0px @white; + border: 0; + &:first-child { + border-left: 1px solid #444; + } + + &:last-child { + border-right: 1px solid #444; + } + + } + + border: 1px solid #444; + flex: 1; + } +} + +nav { + display: none; +} diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 547581aa..49393582 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -31,6 +31,8 @@ function InfoComponent(args) { return (