diff --git a/src/assets/images/header.png b/src/assets/images/header.png new file mode 100644 index 00000000..94ec4dda Binary files /dev/null and b/src/assets/images/header.png differ diff --git a/src/globals.css b/src/globals.css index 5f220c94..27ec0579 100644 --- a/src/globals.css +++ b/src/globals.css @@ -11,6 +11,6 @@ body { *:hover { cursor: default !important; } /* end lynith's native experience */ -h1 { @apply text-2xl font-bold; } +h1 { @apply text-2xl font-semibold; } h2 { @apply text-xxl font-semibold; } h3 { @apply text-xl font-medium; } diff --git a/src/ui/App.tsx b/src/ui/App.tsx index a84825e8..30d933ea 100644 --- a/src/ui/App.tsx +++ b/src/ui/App.tsx @@ -8,7 +8,7 @@ function App(props: ParentProps) {
-
+
{ /* eslint-disable-next-line @typescript-eslint/no-use-before-define */ } {props.children} diff --git a/src/ui/components/base/Button.module.scss b/src/ui/components/base/Button.module.scss index 0a830f1c..3985e6e5 100644 --- a/src/ui/components/base/Button.module.scss +++ b/src/ui/components/base/Button.module.scss @@ -1,6 +1,5 @@ .button { - cursor: default !important; - @apply py-2 px-4 rounded-lg; + @apply py-1.5 px-4 rounded-lg flex flex-row justify-center items-center gap-x-2.5; &__primary { @apply text-onbrand hover:text-onbrand-hover active:text-onbrand-pressed disabled:text-onbrand-disabled; @@ -15,4 +14,8 @@ &__danger { @apply bg-danger hover:bg-danger-hover active:bg-danger-pressed disabled:bg-danger-disabled; } +} + +.icon > * { + @apply w-4; } \ No newline at end of file diff --git a/src/ui/components/base/Button.tsx b/src/ui/components/base/Button.tsx index 9337dced..92b39203 100644 --- a/src/ui/components/base/Button.tsx +++ b/src/ui/components/base/Button.tsx @@ -1,16 +1,23 @@ -import { JSX, ParentProps, mergeProps } from 'solid-js'; +import { + JSX, ParentProps, mergeProps, splitProps, +} from 'solid-js'; import styles from './Button.module.scss'; type ButtonProps = JSX.ButtonHTMLAttributes & ParentProps & { + iconLeft?: JSX.Element, + iconRight?: JSX.Element, styleType?: 'primary' | 'secondary' | 'danger', }; function Button(props: ButtonProps) { - const merged = mergeProps({ styleType: 'primary' }, props); + const [buttonProps, rest] = splitProps(props, ['iconLeft', 'iconRight', 'styleType', 'class']); + const merged = mergeProps({ styleType: 'primary' }, buttonProps); return ( - ); } diff --git a/src/ui/components/base/Tag.module.scss b/src/ui/components/base/Tag.module.scss new file mode 100644 index 00000000..9b1a2665 --- /dev/null +++ b/src/ui/components/base/Tag.module.scss @@ -0,0 +1,8 @@ +.tag { + @apply flex flex-row justify-center items-center gap-x-2; + @apply bg-component-bg/60 border border-gray-.5 text-fg-secondary text-sm font-medium backdrop-blur-md rounded-lg px-2.5 py-0.5; +} + +.icon > * { + @apply w-4; +} \ No newline at end of file diff --git a/src/ui/components/base/Tag.tsx b/src/ui/components/base/Tag.tsx new file mode 100644 index 00000000..e765144d --- /dev/null +++ b/src/ui/components/base/Tag.tsx @@ -0,0 +1,19 @@ +import { JSX, ParentProps } from 'solid-js'; +import styles from './Tag.module.scss'; + +type TagProps = ParentProps & { + iconLeft?: JSX.Element, + iconRight?: JSX.Element, +}; + +function Tag(props: TagProps) { + return ( + + {props.iconLeft && {props.iconLeft}} + {props.children && props.children} + {props.iconRight && {props.iconRight}} + + ); +} + +export default Tag; diff --git a/src/ui/pages/Home.tsx b/src/ui/pages/Home.tsx index d08484cd..8116d431 100644 --- a/src/ui/pages/Home.tsx +++ b/src/ui/pages/Home.tsx @@ -1,8 +1,49 @@ +import { CheckIcon, DotsVerticalIcon, PlayIcon } from '@untitled-theme/icons-solid'; +import image from '../../assets/images/header.png'; +import Button from '../components/base/Button'; +import Tag from '../components/base/Tag'; + +function OneConfigLogo() { + return ( + + + + + + + + + + + + + ); +} + function HomePage() { return (
-

Home

-

Welcome to the home page

+
+ +
+
+

Building worlds

+

A description would go here if I was smart

+
+
+
+ + +
+
+ } /> + }>Verified +
+
+
+
); } diff --git a/tailwind.config.js b/tailwind.config.js index 148ece1f..de4aac9a 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -8,7 +8,8 @@ export default { fontSize: { // Based off 16px - sm: '0.688rem', + xs: '0.688rem', + sm: '0.75rem', md: '0.875rem', lg: '1rem', xl: '1.25rem', @@ -78,6 +79,10 @@ export default { 15: '60px', }, + strokeWidth: { + 3: 3, + }, + animation: { 'fade-in': 'fadeIn 150ms easeOutExpo forwards', 'fade-out': 'fadeOut 150ms easeOutExpo forwards',