Skip to content

Commit 77a233e

Browse files
authored
Merge pull request #3177 from amvanbaren/test-b220b868
Test mobile user menu
2 parents fcf3abd + 4df0574 commit 77a233e

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN apt-get update \
1919
&& corepack prepare yarn@stable --activate
2020

2121
# bump to update website
22-
ENV WEBSITE_VERSION 0.13.1-next.f600763d
22+
ENV WEBSITE_VERSION 0.13.1-next.b220b868
2323
COPY . /workdir
2424

2525
RUN /usr/bin/yarn --cwd website \

website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"repository": "https://github.com/eclipse/open-vsx.org",
77
"license": "EPL-2.0",
88
"dependencies": {
9-
"openvsx-webui": "0.13.1-next.f600763d"
9+
"openvsx-webui": "0.13.1-next.b220b868"
1010
},
1111
"peerDependencies": {
1212
"@babel/core": "^7.0.0"

website/src/menu-content.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const itemIcon = {
4545

4646
const MobileMenuItemText: FunctionComponent<PropsWithChildren> = ({ children }) => {
4747
return (
48-
<Typography variant='body2' sx={{ color: 'text.primary', display: 'flex', alignItems: 'center' }}>
48+
<Typography variant='body2' sx={{ color: 'text.primary', display: 'flex', alignItems: 'center', textTransform: 'none' }}>
4949
{children}
5050
</Typography>
5151
);
@@ -54,18 +54,18 @@ const MobileMenuItemText: FunctionComponent<PropsWithChildren> = ({ children })
5454
export const MobileMenuContent: FunctionComponent = () => {
5555
const {service, user} = useContext(MainContext)
5656
return <>
57-
<MobileMenuItem>
58-
{
59-
user
60-
? <MobileUserAvatar/>
61-
: <RouteLink to={service.getLoginUrl()}>
57+
{
58+
user
59+
? <MobileUserAvatar/>
60+
: <MobileMenuItem>
61+
<Link href={service.getLoginUrl()}>
6262
<MobileMenuItemText>
6363
<AccountBoxIcon sx={itemIcon} />
6464
Log In
6565
</MobileMenuItemText>
66-
</RouteLink>
67-
}
68-
</MobileMenuItem>
66+
</Link>
67+
</MobileMenuItem>
68+
}
6969
{
7070
!location.pathname.startsWith(UserSettingsRoutes.ROOT)
7171
? <MobileMenuItem>

website/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,7 +2399,7 @@ __metadata:
23992399
"@types/react-router-dom": "npm:^5.3.3"
24002400
css-loader: "npm:^6.8.1"
24012401
express: "npm:^4.21.1"
2402-
openvsx-webui: "npm:0.13.1-next.f600763d"
2402+
openvsx-webui: "npm:0.13.1-next.b220b868"
24032403
source-map-loader: "npm:^4.0.1"
24042404
style-loader: "npm:^3.3.3"
24052405
typescript: "npm:~5.1.6"
@@ -2420,9 +2420,9 @@ __metadata:
24202420
languageName: node
24212421
linkType: hard
24222422

2423-
"openvsx-webui@npm:0.13.1-next.f600763d":
2424-
version: 0.13.1-next.f600763d
2425-
resolution: "openvsx-webui@npm:0.13.1-next.f600763d"
2423+
"openvsx-webui@npm:0.13.1-next.b220b868":
2424+
version: 0.13.1-next.b220b868
2425+
resolution: "openvsx-webui@npm:0.13.1-next.b220b868"
24262426
dependencies:
24272427
"@emotion/react": "npm:^11.11.1"
24282428
"@emotion/styled": "npm:^11.11.0"
@@ -2448,7 +2448,7 @@ __metadata:
24482448
react-router-dom: "npm:^6.14.1"
24492449
peerDependencies:
24502450
"@babel/core": ^7.0.0
2451-
checksum: 10/285872702f78f37929a48917f469b1b1591c03923f0bc40a7dd0ede196403c981d21263ae7b64a67030c8241426dbbd33f77ca6da9dfeff1ef725d0451e1525b
2451+
checksum: 10/1800fc864702efae62bfd2682600d511f0fe4ccd0443acf5899a8c4e17f2b7b053a6c0a95ed5532e9c3c411d03258ffd5f78adc9106a1ca92b5a25ba92581390
24522452
languageName: node
24532453
linkType: hard
24542454

0 commit comments

Comments
 (0)