Skip to content

Commit d0e6dd6

Browse files
authored
Improve mobile layout (#221)
1 parent 774ccca commit d0e6dd6

File tree

5 files changed

+51
-22
lines changed

5 files changed

+51
-22
lines changed

src/assets/App.css

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,6 +1488,9 @@ Modal
14881488
border-color: var(--settings-input-border-focus-color);
14891489
}
14901490
@media (max-width: 768px) {
1491+
.extras {
1492+
display: none;
1493+
}
14911494
.Modal {
14921495
left: 0;
14931496
top: 0;
@@ -1500,11 +1503,4 @@ Modal
15001503
box-shadow: none;
15011504
width: auto;
15021505
}
1503-
.settingContent {
1504-
margin-top: 6px;
1505-
}
1506-
.settingRow {
1507-
flex-direction: column;
1508-
align-items: flex-start;
1509-
}
15101506
}

src/components/Layout/SettingsLayout/settings.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
font-size: 18px;
3434
cursor: pointer;
3535
text-decoration: none;
36+
white-space: nowrap;
3637
color: var(--horizontal-tabs-layout-text-color);
3738
}
3839
.horizontalTabsLayout .navigation .link.active {

src/features/MarketingBanner/components/MarketingBanner.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import DOMPurify from 'dompurify'
22
import jsonPath from 'jsonpath'
33
import { useEffect, useMemo, useState } from 'react'
44
import { useMediaQuery } from 'react-responsive'
5+
import { useAuth } from 'src/features/auth'
56
import {
67
trackMarketingCampaignClose,
78
trackMarketingCampaignOpen,
@@ -17,6 +18,7 @@ import { Campaign, MarketingConfig } from '../types'
1718

1819
export const MarketingBanner = () => {
1920
const { setCampaignClosed, closedCampaigns } = useMarketingConfigStore()
21+
const { isConnected } = useAuth()
2022
const { userSelectedTags, cards, firstSeenDate } = useUserPreferences()
2123
const [availableCampaigns, setAvailableCampaigns] = useState<Campaign[]>([])
2224
const { data: marketingConfig } = useGetMarketingConfig({
@@ -36,6 +38,7 @@ export const MarketingBanner = () => {
3638
userTags: userSelectedTags.map((tag) => tag.label),
3739
cards: cards.map((card) => card.name),
3840
firstSeenDate,
41+
isConnected,
3942
usageInDays: diffBetweenTwoDatesInDays(firstSeenDate, Date.now()),
4043
}
4144
}, [userSelectedTags, firstSeenDate, cards])

src/features/settings/components/GeneralSettings/generalSettings.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ Select styles
101101
padding: 20px 0px;
102102
display: flex;
103103
align-items: center;
104+
justify-content: space-between;
104105
border-bottom: 1px solid var(--card-content-divider);
105106

106107
.userImage {
@@ -109,6 +110,16 @@ Select styles
109110
border-radius: 100%;
110111
align-self: flex-start;
111112
}
113+
.userDetails {
114+
display: flex;
115+
flex-direction: row;
116+
gap: 8px;
117+
}
118+
.userInfo {
119+
display: flex;
120+
flex-direction: column;
121+
gap: 8px;
122+
}
112123
.userInfos {
113124
flex: 1;
114125
display: flex;
@@ -214,3 +225,18 @@ Select styles
214225
.streaks .checked:is(:has(+ .checked))::before {
215226
background-color: #18bc2d;
216227
}
228+
229+
@media (max-width: 768px) {
230+
.settingContent {
231+
margin-top: 6px;
232+
}
233+
.settingRow {
234+
flex-direction: column;
235+
align-items: flex-start;
236+
}
237+
.userContent {
238+
flex-direction: column;
239+
align-items: flex-start;
240+
gap: 16px;
241+
}
242+
}

src/features/settings/components/UserSettings/UserInfo.tsx

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,24 @@ export const UserInfo = () => {
4444
onClose={() => setShowLogout(false)}
4545
onConfirm={logout}
4646
/>
47-
{user?.imageURL && <img src={user.imageURL} className="userImage"></img>}
48-
<div className="userInfos">
49-
<div className="userName">{user.name}</div>
50-
<div className="sub">
51-
{providerId == 'github.com' ? (
52-
<FaGithub size={18} />
53-
) : providerId == 'google.com' ? (
54-
<FcGoogle size={18} />
55-
) : null}
56-
Connected with <span className="capitalize">{providerName}</span>
57-
</div>
58-
<div className="actions">
59-
<Button className="logoutBtn" onClick={() => setShowLogout(true)} size="small">
60-
Logout
61-
</Button>
47+
48+
<div className="userDetails">
49+
{user?.imageURL && <img src={user.imageURL} className="userImage"></img>}
50+
<div className="userInfo">
51+
<div className="userName">{user.name}</div>
52+
<div className="sub">
53+
{providerId == 'github.com' ? (
54+
<FaGithub size={18} />
55+
) : providerId == 'google.com' ? (
56+
<FcGoogle size={18} />
57+
) : null}
58+
Connected with <span className="capitalize">{providerName}</span>
59+
</div>
60+
<div className="actions">
61+
<Button className="logoutBtn" onClick={() => setShowLogout(true)} size="small">
62+
Logout
63+
</Button>
64+
</div>
6265
</div>
6366
</div>
6467

0 commit comments

Comments
 (0)