marginally less ugly

This commit is contained in:
Elijah Lucian 2021-07-14 17:50:38 -06:00
parent b45e020080
commit a5577516d2
11 changed files with 56 additions and 66 deletions

View File

@ -1,10 +1,10 @@
@import './scss/variables.scss';
.app { .app {
display: grid; display: grid;
background: #92f322;
grid-template: auto 1fr auto / 1fr; grid-template: auto 1fr auto / 1fr;
align-items: center; align-items: center;
color: white;
h1 { h1 {
margin-top: 2.5vmin; margin-top: 2.5vmin;
@ -12,5 +12,40 @@
} }
main { main {
height: 100%;
} }
} }
h1,
h2,
h3,
h4,
h5 {
color: $color-grey;
font-weight: 900;
margin: 0;
}
p {
margin: 0;
color: $color-grey;
}
a {
color: $color-primary;
&:hover {
color: lighen($color-primary, 1.5);
}
}
button {
border: 0;
padding: 0.25rem 0.5rem;
background: $color-primary;
color: $color-white;
}
input {
padding: 0.25rem;
}

View File

@ -1,11 +1,8 @@
.dank-form { .dank-form {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: #1115;
border: 1ch #1117 solid;
padding: 3ch; padding: 3ch;
border-radius: 1ch;
color: #ccc;
label { label {
margin: 0.5ch; margin: 0.5ch;
display: flex; display: flex;
@ -17,10 +14,6 @@
} }
} }
h3 {
color: #666;
}
button { button {
margin: 4ch 1ch; margin: 4ch 1ch;
} }

View File

@ -8,13 +8,11 @@
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
&.error { &.error {
color: #ffffff;
background: #b40303; background: #b40303;
opacity: 1; opacity: 1;
} }
&.good { &.good {
color: #ffffff;
background: #009b46; background: #009b46;
opacity: 1; opacity: 1;
} }

View File

@ -8,14 +8,6 @@
height: 100vh; height: 100vh;
} }
h1,
h2,
h3,
h4,
h5 {
font-weight: 900;
}
body, body,
html { html {
font-family: sans-serif; font-family: sans-serif;

View File

@ -1,16 +1,16 @@
@import '../../scss/variables.scss';
footer { footer {
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
background: #111a; background: $color-dark;
padding: 0 2ch; padding: 0.5rem;
font-size: 10pt;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
p { p {
margin: 1ch; color: $color-light;
} }
} }

View File

@ -1,11 +1,13 @@
@import '../../scss/variables.scss';
header { header {
display: flex; display: flex;
padding: 0.5rem;
flex-direction: row; flex-direction: row;
width: 100%; width: 100%;
justify-content: space-around; background: $color-dark;
background: #111a;
h1 { h3 {
margin: 0; color: $color-light;
} }
} }

View File

@ -2,8 +2,6 @@ import { Input } from 'antd'
import FormItem from 'antd/lib/form/FormItem' import FormItem from 'antd/lib/form/FormItem'
import { Link } from 'react-router-dom' import { Link } from 'react-router-dom'
import { User } from '../../types' import { User } from '../../types'
import './style.scss'
import { useUserContext } from '../../contexts/UserContext' import { useUserContext } from '../../contexts/UserContext'
import { Form } from '../../elements/Form' import { Form } from '../../elements/Form'
import { Button } from '../../elements/Button' import { Button } from '../../elements/Button'
@ -22,8 +20,8 @@ export const Login = () => {
return ( return (
<div className="login"> <div className="login">
<h1>Log In</h1>
<Form onFinish={handleFinish} form={form}> <Form onFinish={handleFinish} form={form}>
<h1>Log In</h1>
<FormItem label="Username" name="username"> <FormItem label="Username" name="username">
<Input /> <Input />
</FormItem> </FormItem>

View File

@ -1,32 +0,0 @@
.login {
display: flex;
border: 1px solid #111;
flex-direction: column;
margin: 0 auto;
border-radius: 0.2rem;
padding: 2rem 2rem;
h1 {
margin: 0 auto;
}
form {
display: flex;
flex-direction: column;
justify-content: space-between;
text-align: center;
.ant-row {
margin: 1rem 2rem;
}
.form-footer {
margin-top: 1rem;
button {
width: 50%;
margin: auto 0 auto 1rem;
}
}
}
}

View File

@ -4,7 +4,6 @@
text-align: center; text-align: center;
text-decoration: underline; text-decoration: underline;
} }
font-size: 14pt;
margin: 2ch; margin: 2ch;
background: #fff1; background: #fff1;
padding: 0 2ch 1ch; padding: 0 2ch 1ch;

View File

@ -0,0 +1,6 @@
$color-primary: #57837b;
$color-alt: #c9d8b6;
$color-light: #f1ecc3;
$color-white: #fff;
$color-grey: #515e63;
$color-dark: #333;

View File

@ -20,7 +20,6 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 2ch; padding: 2ch;
color: #333;
text-shadow: 2px 2px #2223, -1px -1px #fffa; text-shadow: 2px 2px #2223, -1px -1px #fffa;
} }