Skip to content

Commit 8ff691c

Browse files
committed
fix mobilecard gap and padding + eslint fix
1 parent 7828c45 commit 8ff691c

File tree

5 files changed

+29
-14
lines changed

5 files changed

+29
-14
lines changed

frontend-next-migration/src/preparedPages/ClanPages/ui/ClanAllSubPage/ClanAllSubPage.module.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,17 @@ main :where(.SearchBarDesktop, .SearchBarMobile) {
6565
}
6666

6767
.MobileCardContainer {
68-
--gap: 1rem;
68+
--gap: 0.45rem;
69+
--row-gap: 0.95rem;
6970
display: flex;
7071
flex-wrap: wrap;
71-
gap: var(--gap);
72+
column-gap: var(--gap);
73+
row-gap: var(--row-gap);
7274
justify-content: flex-start;
7375
align-items: flex-start;
7476
width: 100%;
75-
margin-top: .5rem;
77+
padding-inline: 0;
78+
margin-top: 0.25rem;
7679
}
7780

7881
.MobileCardItemWrap {

frontend-next-migration/src/preparedPages/ClanPages/ui/ClanAllSubPage/ClanAllSubPage.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,16 @@ const ClansViewDesktop = ({ clans, onClickToClan }: DesktopProps) => {
216216
</div>
217217

218218
<div className={cardCls.ClanLabels}>
219-
{MOCK_LABELS.map((l) => (
219+
{MOCK_LABELS.map((label) => (
220220
<span
221221
className={cardCls.ClanLabel}
222-
key={l.text}
222+
key={label.text}
223223
>
224224
<Image
225-
src={l.icon}
226-
alt={l.text}
225+
src={label.icon}
226+
alt={label.text}
227227
/>
228-
{l.text}
228+
{label.text}
229229
</span>
230230
))}
231231
</div>

frontend-next-migration/src/preparedPages/ClanPages/ui/ClanLayout/ClanLayout.module.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
width: 100%;
1313
max-width: unset;
1414
overflow-x: hidden;
15-
padding: 0 16px;
1615
margin: 0 auto;
1716
}
1817

frontend-next-migration/src/preparedPages/ClanPages/ui/ClanLayout/ClanLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const SearchBar = ({
4040
<input
4141
type="text"
4242
value={value}
43-
onChange={(e) => onChange(e.target.value)}
43+
onChange={(event) => onChange(event.target.value)}
4444
placeholder="Search"
4545
className={inputClassName}
4646
aria-label={ariaLabel}

frontend-next-migration/src/shared/ui/v2/MobileCard/ui/MobileCard.module.scss

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,10 @@
202202
margin: 0;
203203
text-align: center;
204204
max-width: 100%;
205-
white-space: nowrap;
205+
white-space: normal;
206206
overflow: hidden;
207-
text-overflow: ellipsis;
207+
word-break: break-word;
208+
text-overflow: clip;
208209
}
209210

210211
.Text { margin: 0; }
@@ -218,7 +219,7 @@
218219
padding: 0.25rem 0;
219220

220221
.Image {
221-
height: 74%;
222+
height: auto;
222223
object-fit: contain !important;
223224
}
224225
}
@@ -268,8 +269,20 @@
268269
}
269270
}
270271

272+
@media (min-width: 768px) and (max-width: 1024px) {
273+
.MobileCard.ClanCard > .ImageContainer .Image {
274+
width: 80%;
275+
}
276+
}
277+
278+
@media (max-width: 400px) {
279+
.MobileCard.ClanCard > .TextContainer:first-of-type .Title1 {
280+
font-size: 1.15rem;
281+
}
282+
}
283+
271284
@media (max-width: 360px) {
272285
.MobileCard.ClanCard > .TextContainer:first-of-type .Title1 {
273-
font-size: 1.1rem;
286+
font-size: 1rem;
274287
}
275288
}

0 commit comments

Comments
 (0)