diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx index 41980dc4..1f4159ea 100644 --- a/src/components/App/index.tsx +++ b/src/components/App/index.tsx @@ -36,7 +36,7 @@ export const App: React.FC = props => { header={(
{hideBreadcrumbs || !props.breadcrumbs ? null : ( diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx index 01b37473..56f861cb 100644 --- a/src/components/Button/index.tsx +++ b/src/components/Button/index.tsx @@ -2,19 +2,27 @@ import './styles.css' import Link from 'next/link' import cx from 'classnames' +import { useCallback } from 'react' export type ButtonProps = { + value?: any style?: React.CSSProperties href?: string - theme?: 'default' | 'ghost' + theme?: 'default' | 'ghost' | 'icon' size?: 'default' | 'small' disabled?: boolean + onClick?: (value: any, event: MouseEvent) => void } export const Button: React.FC = ({ size = 'default', theme = 'default', disabled = false, ...props }) => { - const className = cx('button', theme, size, { + const className = cx('button', `size_${size}`, `theme_${theme}`, { disabled }) + const onClick = useCallback(event => { + if (props.onClick) { + props.onClick(props.value, event) + } + }, [props.value, props.onClick]) if (props.href) { return ( @@ -27,7 +35,11 @@ export const Button: React.FC = ({ size = 'default', theme = 'defau } return ( - ) diff --git a/src/components/Button/styles.css b/src/components/Button/styles.css index b6d3cb89..0bbeb3f4 100644 --- a/src/components/Button/styles.css +++ b/src/components/Button/styles.css @@ -1,9 +1,8 @@ .button { + display: block; font-size: var(--font-size-default); text-align: center; - margin-top: var(--size-m); - margin-bottom: var(--size-m); border-radius: 100px; border: 1px solid var(--color-shadow); @@ -17,8 +16,9 @@ } .button:hover { - margin-left: 1px; - margin-right: 1px; + margin: 1px; + /* margin-left: 1px; + margin-right: 1px; */ border: none; box-shadow: var(--shadow-active); @@ -31,19 +31,23 @@ color: var(--color-text-second); } -/* THEME */ - -.button.ghost { - border-color: rgba(0, 0, 0, 0); -} - /* SIZE */ -.button.default { +.button.size_default { padding: var(--size-s) var(--size-m); } -.button.small { +.button.size_small { padding: var(--size-xs) var(--size-s); font-size: var(--font-size-second); } + +/* THEME */ + +.button.theme_ghost { + border-color: rgba(0, 0, 0, 0); +} + +.button.theme_icon { + padding: var(--size-xs) var(--size-xs); +} diff --git a/src/components/Menu/styles.css b/src/components/Menu/styles.css index 61ebda64..51ebd2be 100644 --- a/src/components/Menu/styles.css +++ b/src/components/Menu/styles.css @@ -3,6 +3,7 @@ align-items: flex-start; flex-wrap: wrap; + font-size: var(--font-size-second); list-style: none; } @@ -22,14 +23,18 @@ /* MOBILE */ .menuItem.mobile { - font-size: 1.25em; - color: var(--color-text-opposite); + font-size: var(--font-size-default); padding: var(--size-xs) var(--size-s); } .menuItem.mobile.selected { background-color: var(--color-back-opposite); + color: var(--color-text-opposite) +} + +.menuItem.mobile.selected a { + color: var(--color-text-opposite) } /* DESKTOP */ diff --git a/src/components/MenuToggle/index.tsx b/src/components/MenuToggle/index.tsx index ca64be54..724c7977 100644 --- a/src/components/MenuToggle/index.tsx +++ b/src/components/MenuToggle/index.tsx @@ -1,79 +1,27 @@ -import * as React from 'react' +import './styles.css' + import cx from 'classnames' +import { Button } from '../Button' export interface IMenuToggleProps { style?: React.CSSProperties open: boolean - position: 'left' | 'right' onClick: () => void } export const MenuToggle: React.FC = props => { return ( -
- - - -
+
+ ) } diff --git a/src/components/MenuToggle/styles.css b/src/components/MenuToggle/styles.css new file mode 100644 index 00000000..1f984b06 --- /dev/null +++ b/src/components/MenuToggle/styles.css @@ -0,0 +1,14 @@ +.toggle { + --s: 32px; + width: var(--s); + height: var(--s); + background-size: var(--s); +} + +.toggle.open { + background-image: url(/static/graphics/hmenu-close-b.png); +} + +.toggle.close { + background-image: url(/static/graphics/hmenu-b.png); +} diff --git a/src/components/Navigation/index.tsx b/src/components/Navigation/index.tsx index 4985b75c..a9f724e1 100644 --- a/src/components/Navigation/index.tsx +++ b/src/components/Navigation/index.tsx @@ -4,6 +4,8 @@ import { Menu } from '../Menu' import { Overlay } from '../Overlay' import { useState, useCallback, useContext } from 'react' import { ConfigContext } from 'src/context/ConfigContext' +import { Block } from '../Block' +import { Spacer } from '../Spacer' export interface INavigationProps { style?: React.CSSProperties @@ -21,49 +23,54 @@ export const Navigation: React.FC = props => { const { menu } = useContext(ConfigContext) return ( - + + {collapseMenu ? ( + + + + + ) : ( + + )} + ) } diff --git a/src/components/Overlay/index.tsx b/src/components/Overlay/index.tsx index b82eae66..94a16d0f 100644 --- a/src/components/Overlay/index.tsx +++ b/src/components/Overlay/index.tsx @@ -1,46 +1,42 @@ -import * as React from 'react' +import './styles.css' + import { Transition } from './Transition' import { useReducedMotion } from '../../hooks/useReducedMotion' +import { useCallback, useEffect } from 'react' export interface IOverlayProps { show: boolean onClickOverlay: () => void + style?: React.CSSProperties } export const Overlay: React.FC = props => { const motionDisabled = useReducedMotion() - const duration = motionDisabled ? 0 : 250 - - const onClick = React.useCallback((event: React.MouseEvent) => { + const onClick = useCallback((event: React.MouseEvent) => { if (event.target === event.currentTarget) { props.onClickOverlay() } }, [props.onClickOverlay]) + const duration = motionDisabled ? 0 : 250 + + useEffect(() => { + if (props.show) { + document.body.classList.add('noscroll') + } else { + document.body.classList.remove('noscroll') + } + }, [props.show]) return (
- - {props.children}
diff --git a/src/components/Overlay/styles.css b/src/components/Overlay/styles.css new file mode 100644 index 00000000..eb2b3eb6 --- /dev/null +++ b/src/components/Overlay/styles.css @@ -0,0 +1,11 @@ +.overlay { + position: fixed; + width: 100%; + height: 100%; + top: 0; + left: 0; + overflow-y: auto; + z-index: 1000000; + + background-color: var(--color-back-main); +} diff --git a/src/style.css b/src/style.css index a6347148..7975583e 100644 --- a/src/style.css +++ b/src/style.css @@ -175,12 +175,8 @@ a.invisible { border-bottom-color: var(--color-text-opposite); } -.actor { - border-bottom: 1px dashed black; -} - -.actor:hover { - border-bottom: 2px solid black; +.noscroll { + overflow: hidden; } @media (max-width: 31.25em) {