diff --git a/sites/shared/components/icons.mjs b/sites/shared/components/icons.mjs index db53894ef21..e34d6d4fd97 100644 --- a/sites/shared/components/icons.mjs +++ b/sites/shared/components/icons.mjs @@ -401,6 +401,12 @@ export const MenuIcon = (props) => ( ) +export const MenuAltIcon = (props) => ( + + + +) + export const MsetIcon = (props) => ( @@ -719,3 +725,15 @@ export const YouTubeIcon = (props) => ( ) + +export const ZoomInIcon = (props) => ( + + + +) + +export const ZoomOutIcon = (props) => ( + + + +) diff --git a/sites/shared/components/workbench/header.mjs b/sites/shared/components/workbench/header.mjs index 3cb3801d4ac..8ef1e23101b 100644 --- a/sites/shared/components/workbench/header.mjs +++ b/sites/shared/components/workbench/header.mjs @@ -46,7 +46,7 @@ export const NavButton = ({ const className = `w-full flex flex-row items-center px-4 py-2 ${extraClasses} ${ active ? 'text-secondary' : '' }` - const span = {label} + const span = {label} return onClick ? ( @@ -70,7 +70,7 @@ const NavIcons = ({ setView, setDense, dense, view }) => { setDense(!dense)} label={t('workbench:viewMenu')} - extraClasses="hidden lg:flex text-success bg-neutral hover:bg-success hover:text-neutral" + extraClasses="hidden lg:flex text-accent bg-neutral hover:bg-accent hover:text-neutral-content" > {dense ? ( { slideFrom="right" keepOpenOnClick={selectedMenu.keepOpenOnClick} keepOpenOnSwipe + fullWidth > {selectedMenu.menuContent} { { {Object.keys(menus) .sort((a, b) => menus[a].order - menus[b].order) .map((m) => { - const Icon = menus[m].Icon + const Icon = m === 'nav' ? MenuAltIcon : menus[m].Icon return ( setSelectedModal(m)} > diff --git a/sites/shared/components/workbench/views/measies/index.mjs b/sites/shared/components/workbench/views/measies/index.mjs index e0d0c57f418..b47856db1ef 100644 --- a/sites/shared/components/workbench/views/measies/index.mjs +++ b/sites/shared/components/workbench/views/measies/index.mjs @@ -20,6 +20,8 @@ import { MsetIcon, BookmarkIcon, CsetIcon, EditIcon } from 'shared/components/ic export const ns = nsMerge(authNs, setsNs) +const iconClasses = { className: 'w-8 h-8 md:w-10 md:h-10 lg:w-12 lg:h-12 shrink-0', stroke: 1.5 } + export const MeasiesView = ({ design, Design, settings, update, missingMeasurements, setView }) => { const { t } = useTranslation(['workbench']) const { setLoadingStatus, LoadingStatus } = useLoadingStatus() @@ -61,7 +63,7 @@ export const MeasiesView = ({ design, Design, settings, update, missingMeasureme {t('workbench:chooseFromOwnSets')} - + {t('workbench:chooseFromOwnSetsDesc')} , @@ -77,7 +79,7 @@ export const MeasiesView = ({ design, Design, settings, update, missingMeasureme {t('workbench:chooseFromBookmarkedSets')} - + {t('workbench:chooseFromBookmarkedSetsDesc')} , @@ -93,7 +95,7 @@ export const MeasiesView = ({ design, Design, settings, update, missingMeasureme {t('workbench:chooseFromCuratedSets')} - + {t('workbench:chooseFromCuratedSetsDesc')} , @@ -103,7 +105,7 @@ export const MeasiesView = ({ design, Design, settings, update, missingMeasureme {t('workbench:editMeasiesByHand')} - + {t('workbench:editMeasiesByHandDesc')} , diff --git a/sites/shared/components/workbench/views/view-header.mjs b/sites/shared/components/workbench/views/view-header.mjs index 9975dea205b..3213a4c539b 100644 --- a/sites/shared/components/workbench/views/view-header.mjs +++ b/sites/shared/components/workbench/views/view-header.mjs @@ -10,11 +10,11 @@ import { BulletIcon, UnitsIcon, DetailIcon, - IconWrapper, - ClearIcon, ResetIcon, UploadIcon, BookmarkIcon, + ZoomInIcon, + ZoomOutIcon, } from 'shared/components/icons.mjs' import { shownHeaderSelector } from 'shared/components/wrappers/header.mjs' import { useLoadingStatus } from 'shared/hooks/use-loading-status.mjs' @@ -22,18 +22,6 @@ import { capitalize, shortDate } from 'shared/utils.mjs' export const ns = ['common', 'core-settings', 'ui-settings'] -const ZoomInIcon = (props) => ( - - - -) - -const ZoomOutIcon = (props) => ( - - - -) - const IconButton = ({ Icon, onClick, dflt = true, title, hide = false, extraClasses = '' }) => ( { if (!zoomFunctions) return null return ( { const { clearModal } = useContext(ModalContext) const [animate, setAnimate] = useState('in') @@ -68,7 +69,9 @@ export const ModalWrapper = ({ children ) : ( {children}
{t('workbench:chooseFromOwnSetsDesc')}
{t('workbench:chooseFromBookmarkedSetsDesc')}
{t('workbench:chooseFromCuratedSetsDesc')}
{t('workbench:editMeasiesByHandDesc')}