Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to New Squaremorphism UI #76

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Update to New Squaremorphism UI #76

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
262620b
Update to New Squaremorphism UI
mu-hun May 11, 2020
720a177
Implement focus style
mu-hun May 11, 2020
f25c933
Fix typo
mu-hun May 11, 2020
754cc9f
Swap invalid props value
mu-hun May 11, 2020
9289ecd
Update Main Box style
mu-hun May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/app/components/Input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ import { h, JSX } from 'preact'
import { User, Lock, Eye, EyeOff } from 'preact-feather'

import { Input as OriginalInput } from '../../styles/components/Input'
import { darken_ultra, darken_medium, invaild } from '../../styles/colors'
import {
darken_ultra,
darken_medium,
invalid,
white,
innerShadow,
} from '../../styles/colors'
import { css, cx } from 'linaria'
import { styled } from 'linaria/react'
import { useState } from 'preact/hooks'
Expand All @@ -13,10 +19,17 @@ const LoginOutside = styled.div<IsWrong & JSX.HTMLAttributes<HTMLDivElement>>`
padding-top: 5px;
padding-bottom: 5px;
background-color: ${darken_ultra};
box-shadow: 0 0 0 2px ${props => (props.isWrong ? invaild.outside : '')};
border: solid 1px ${props => (props.isWrong ? invaild.inside : 'transparent')};
transition: ${props => (props.isWrong ? 'border 0.5s' : '')};
transition: ${props => (props.isWrong ? 'box-shadow 0.5s' : '')};
box-shadow: inset 2px 2px 12px 0
${props => (props.isWrong ? invalid.outside : white)},
inset -5px -5px 8px 0
${props => (props.isWrong ? invalid.inside : innerShadow)};
transition: box-shadow 0.2s ease-in-out;
&:focus-within {
box-shadow: inset 2px 2px 12px 0
${props => (props.isWrong ? invalid.outside : white)},
inset -8px -8px 15px 0
${props => (props.isWrong ? invalid.inside : innerShadow)};
}
`

const Icon = css`
Expand Down
5 changes: 5 additions & 0 deletions src/app/components/Submit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ const SubmitButton = styled.button`
cursor: pointer;
width: 178px;
align-self: center;
box-shadow: 0 10px 24px 0 ${primary};
transition: box-shadow 0.2s ease-in-out;
:hover {
box-shadow: 0 3px 10px 0 ${primary};
}
`

const Text = styled.span`
Expand Down
7 changes: 4 additions & 3 deletions src/styles/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ export const transparent = 'rgba(0, 0, 0, 0)'
export const background = '#f7f7f7'

export const mainBoxShadow = 'rgba(21, 19, 19, 0.07)'
export const innerShadow = '#dadeeb'

export const valid = {
outside: 'rgba(186, 231, 255, 0.65)',
inside: 'rgba(64, 169, 255, 0.65)',
}

export const invaild = {
outside: 'rgba(244, 179, 187, 0.65)',
inside: 'rgba(229, 27, 52, 0.65)',
export const invalid = {
outside: 'rgba(229, 27, 52, 0.65)',
inside: 'rgba(244, 179, 187, 0.65)',
}

export const green = 'rgba(82, 196, 26, 0.85)'
Expand Down