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.

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

ux: adjust icon size, margins #1078

Merged
merged 2 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion frontend/src/components/Collapse/collapse.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$background-color: var(--grey-975);

line-height: initial;
width: 350px;
width: 300px;
text-align: left;

.header {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/Header/SmallHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ function SmallHeader() {
): MainNavigationProps.Item {
const link = getUserNavItem(navItem);
return {
className: styles.mainNavigationItem,
linkProps: {
to: link.url
},
text: <><span className={link.icon} aria-hidden="true"></span> {link.label} {link.showNewBadge && <Badge small={true} severity='success' noIcon={true} className="fr-ml-1w">Nouveau</Badge>}</>,
text: <><span className={`${link.icon} ${styles.icon}`} aria-hidden="true"></span>{link.label}{link.showNewBadge && <Badge small={true} severity='success' noIcon={true} className="fr-ml-1w fr-mr-0w">Nouveau</Badge>}</>,
isActive: location.pathname.startsWith(link.url),
};
}
Expand Down Expand Up @@ -116,7 +117,7 @@ function SmallHeader() {
}}
/>
) : (
<Typography component="span" mr={2} variant="body2">
<Typography className={styles.establishmentName} component="span" mr={2} variant="body2">
{establishment?.name}
</Typography>
)
Expand Down
44 changes: 44 additions & 0 deletions frontend/src/components/Header/small-header.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,47 @@
height: 2px;
z-index: 1000;
}

.icon::before {
--icon-size: 1.25rem;
margin-right: 0.5rem;
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;
}
}
2 changes: 1 addition & 1 deletion frontend/src/models/UserNavItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const getUserNavItem = (userNavItem: UserNavItems): UserNavItem => {
case UserNavItems.Resources:
return { url: '/ressources', label: 'Ressources', icon: 'fr-icon-information-line' };
case UserNavItems.Analysis:
return { url: '/analyses', label: 'Analyses', showNewBadge: true, icon: 'fr-icon-bar-chart-box-line' };
return { url: '/analyses', label: 'Analyses', showNewBadge: true, icon: 'ri-bar-chart-2-line' };
default:
return { url: '/', label: 'Accueil', icon: 'fr-icon-building-line' };
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/views/Account/AccountSideMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -31,7 +32,7 @@ const AccountSideMenu = () => {
</AppLink>
</div>
<hr className="fr-py-1w" />
<Text className="color-grey-625" size="sm" bold spacing="mb-0">
<Text className={`color-grey-625 ${styles.establishmentName}`} size="sm" bold spacing="mb-0">
{establishment?.name}
</Text>
<div className="fr-py-2w">
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/views/Account/account-side-menu.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.establishmentName {
overflow: hidden;
text-overflow: ellipsis;
}
Loading