diff --git a/frontend/src/components/Collapse/collapse.module.scss b/frontend/src/components/Collapse/collapse.module.scss index 6677db2d3..7a2a10a55 100644 --- a/frontend/src/components/Collapse/collapse.module.scss +++ b/frontend/src/components/Collapse/collapse.module.scss @@ -2,7 +2,7 @@ $background-color: var(--grey-975); line-height: initial; - width: 350px; + width: 300px; text-align: left; .header { diff --git a/frontend/src/components/Header/SmallHeader.tsx b/frontend/src/components/Header/SmallHeader.tsx index 5694e3001..b3ec7072a 100644 --- a/frontend/src/components/Header/SmallHeader.tsx +++ b/frontend/src/components/Header/SmallHeader.tsx @@ -39,6 +39,7 @@ function SmallHeader() { ): MainNavigationProps.Item { const link = getUserNavItem(navItem); return { + className: styles.mainNavigationItem, linkProps: { to: link.url }, @@ -116,7 +117,7 @@ function SmallHeader() { }} /> ) : ( - + {establishment?.name} ) diff --git a/frontend/src/components/Header/small-header.module.scss b/frontend/src/components/Header/small-header.module.scss index 44e113369..57042cc44 100644 --- a/frontend/src/components/Header/small-header.module.scss +++ b/frontend/src/components/Header/small-header.module.scss @@ -26,3 +26,40 @@ position: relative; top: -2px; } + +.mainNavigationItem { + margin-left: 0px !important; +} + +@media screen and (max-width: 1484px) { + .establishmentName { + max-width: 200px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } +} + +@media screen and (max-width: 1412px) { + .establishmentName { + max-width: 150px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } +} + +@media screen and (max-width: 1362px) { + .establishmentName { + max-width: 100px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } +} + +@media screen and (max-width: 1312px) { + .establishmentName { + display: none; + } +} diff --git a/frontend/src/dsfr-fix.scss b/frontend/src/dsfr-fix.scss index 7d7802edc..b72c239a5 100644 --- a/frontend/src/dsfr-fix.scss +++ b/frontend/src/dsfr-fix.scss @@ -110,7 +110,3 @@ span.fr-icon-checkbox-circle-line.ds-fr-tag-icon { } } } - -.fr-nav__list > :first-child:nth-last-child(4) ~ * { - margin-left: 0px; -} diff --git a/frontend/src/views/Account/AccountSideMenu.tsx b/frontend/src/views/Account/AccountSideMenu.tsx index 8ecbe7f5e..08e13778d 100644 --- a/frontend/src/views/Account/AccountSideMenu.tsx +++ b/frontend/src/views/Account/AccountSideMenu.tsx @@ -5,6 +5,7 @@ import { logOut } from '../../store/actions/authenticationAction'; import { useUser } from '../../hooks/useUser'; import { useLocation } from 'react-router-dom'; import classNames from 'classnames'; +import styles from './account-side-menu.module.scss'; const AccountSideMenu = () => { const location = useLocation(); @@ -31,7 +32,7 @@ const AccountSideMenu = () => {
- + {establishment?.name}
diff --git a/frontend/src/views/Account/account-side-menu.module.scss b/frontend/src/views/Account/account-side-menu.module.scss new file mode 100644 index 000000000..1e6426a57 --- /dev/null +++ b/frontend/src/views/Account/account-side-menu.module.scss @@ -0,0 +1,4 @@ +.establishmentName { + overflow: hidden; + text-overflow: ellipsis; +}