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.

Sign up for GitHub

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

Jump to bottom

frontend: Fix visibility of Sidebar Elements and Navigation Tabs #1720

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

frontend: Fix visibility of Sidebar Elements and Navigation Tabs #1720

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63c60b4
Fixed sidebar and navigation tabs visibility on mobile devices
tazo90 Feb 15, 2024
958c596
Merge remote-tracking branch 'origin/main' into fix/1719-sidebar-and-…
tazo90 Feb 19, 2024
bba6366
Update snapshots
tazo90 Feb 19, 2024
e500d42
Add missing translation files and fix test related to i18n
tazo90 Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 6 additions & 10 deletions frontend/src/components/Sidebar/NavigationTabs.tsx
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This merge commit should be avoided by rebasing your changes + solving the conflicts.

Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ import Tabs from '../common/Tabs';
import { SidebarItemProps } from '../Sidebar';
import prepareRoutes from './prepareRoutes';

const useStyle = makeStyles(theme => ({
tabs: {
maxWidth: '85vw',
[theme.breakpoints.down('sm')]: {
paddingTop: '10px',
},
},
}));

function searchNameInSubList(sublist: SidebarItemProps['subList'], name: string): boolean {
if (!sublist) {
return false;
Expand Down Expand Up @@ -121,7 +112,12 @@ export default function NavigationTabs() {
tabChangeHandler(index);
}}
defaultIndex={defaultIndex}
sx={{ maxWidth: '85vw' }}
sx={{
maxWidth: '85vw',
[theme.breakpoints.down('sm')]: {
paddingTop: '10px',
},
}}
ariaLabel={t('translation|Navigation Tabs')}
/>
<Divider />
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.