Skip to content

Commit 2a36cbc

Browse files
committed
Merge branch 'develop' into feature/park
2 parents ecc8537 + c461fd3 commit 2a36cbc

File tree

2 files changed

+91
-0
lines changed

2 files changed

+91
-0
lines changed

src/components/recipient/HeaderService/HeaderService.module.scss

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
margin-left: 0;
4646
padding: 16px;
4747
}
48+
49+
@media (max-width: 420px) {
50+
padding: 12px;
51+
}
4852
}
4953

5054
&__name-section {
@@ -58,6 +62,10 @@
5862
padding: 16px;
5963
border-bottom: 1px solid $gray-200;
6064
}
65+
66+
@media (max-width: 420px) {
67+
padding: 12px 16px;
68+
}
6169
}
6270

6371
&__recipient-name {
@@ -72,6 +80,10 @@
7280
font-size: 24px;
7381
font-weight: bold;
7482
}
83+
84+
@media (max-width: 420px) {
85+
font-size: 22px;
86+
}
7587
}
7688

7789
&__profile-section {
@@ -140,6 +152,10 @@
140152
height: 28px;
141153
background-color: $gray-200;
142154
margin: 0 13px;
155+
156+
@media (max-width: 360px) {
157+
display: none;
158+
}
143159
}
144160
}
145161

@@ -149,6 +165,14 @@
149165
gap: 8px;
150166
justify-content: space-between;
151167
width: 100%;
168+
169+
@media (max-width: 420px) {
170+
gap: 4px;
171+
}
172+
173+
@media (max-width: 360px) {
174+
gap: 3px;
175+
}
152176
}
153177

154178
&__emojis-left-group {
@@ -161,6 +185,14 @@
161185
display: flex;
162186
align-items: center;
163187
gap: 8px;
188+
189+
@media (max-width: 420px) {
190+
gap: 6px;
191+
}
192+
193+
@media (max-width: 360px) {
194+
gap: 4px;
195+
}
164196
}
165197

166198
&__emojis {
@@ -170,6 +202,16 @@
170202
border-radius: 32px;
171203
padding: 8px 0;
172204
@include font-16-regular;
205+
206+
@media (max-width: 767px) {
207+
gap: 6px;
208+
padding: 6px 0;
209+
}
210+
211+
@media (max-width: 420px) {
212+
gap: 4px;
213+
padding: 4px 0;
214+
}
173215
}
174216

175217
&__emoji-item {
@@ -195,6 +237,21 @@
195237
background-color: #5d5d5d;
196238
transform: scale(1.05);
197239
}
240+
241+
@media (max-width: 767px) {
242+
width: 52px;
243+
height: 32px;
244+
padding: 4px 8px;
245+
font-size: 14px;
246+
gap: 2px;
247+
}
248+
249+
@media (max-width: 420px) {
250+
width: 44px;
251+
height: 28px;
252+
padding: 2px 6px;
253+
font-size: 13px;
254+
}
198255
}
199256

200257
&__emoji-more-container {
@@ -243,6 +300,12 @@
243300
min-width: auto;
244301
box-sizing: border-box;
245302
}
303+
304+
@media (max-width: 420px) {
305+
width: 220px;
306+
padding: 8px;
307+
top: 35px;
308+
}
246309
}
247310

248311
&__emoji-dropdown-grid {
@@ -259,6 +322,10 @@
259322
@media (max-width: 975px) {
260323
grid-template-columns: repeat(3, 1fr);
261324
}
325+
326+
@media (max-width: 420px) {
327+
gap: 6px;
328+
}
262329
}
263330

264331
&__emoji-dropdown-item {
@@ -285,6 +352,20 @@
285352
background-color: #5d5d5d;
286353
transform: scale(1.05);
287354
}
355+
356+
@media (max-width: 767px) {
357+
width: 52px;
358+
height: 32px;
359+
padding: 4px 8px;
360+
font-size: 14px;
361+
}
362+
363+
@media (max-width: 420px) {
364+
width: 44px;
365+
height: 28px;
366+
padding: 2px 6px;
367+
font-size: 13px;
368+
}
288369
}
289370

290371
&__add-button {
@@ -314,6 +395,11 @@
314395
display: none;
315396
}
316397
}
398+
399+
@media (max-width: 375px) {
400+
width: 32px;
401+
height: 28px;
402+
}
317403
}
318404

319405
&__emoji-picker-container {

src/components/recipient/HeaderService/Share/ShareButton.module.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
height: 32px;
2626
padding: 4px;
2727
}
28+
29+
@media (max-width: 375px) {
30+
width: 32px;
31+
height: 28px;
32+
}
2833
}
2934

3035
.share-options {

0 commit comments

Comments
 (0)