Skip to content

Commit ffa8fad

Browse files
ThomasKranitsasThomasKranitsas
authored
Merge pull request #1581 from sumitdaga/issue-1487
Issue 1487
2 parents 7c88f7d + 4bbff4a commit ffa8fad

File tree

45 files changed

+290
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+290
-278
lines changed

‎src/shared/components/Settings/Account/LinkedAccount/styles.scss

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
justify-content: space-between;
1111
//margin-top: 10px;
1212

13-
@include xs-to-sm {
13+
@include upto-sm {
1414
flex-flow: row wrap;
1515
flex-direction: row;
1616
}
@@ -230,7 +230,7 @@
230230

231231
.web-link {
232232
.form-container-default {
233-
@include xs-to-sm {
233+
@include upto-sm {
234234
display: none;
235235
}
236236

@@ -303,7 +303,7 @@
303303
.form-container-mobile {
304304
display: none;
305305

306-
@include xs-to-sm {
306+
@include upto-sm {
307307
border: 0;
308308
border-radius: 0;
309309
display: flex;
@@ -336,7 +336,7 @@
336336
font-weight: 400;
337337
color: $tc-black;
338338

339-
@include xs-to-sm {
339+
@include upto-sm {
340340
margin-bottom: 20px;
341341
}
342342
}
@@ -347,7 +347,7 @@
347347
margin-bottom: 20px;
348348
align-content: space-between;
349349

350-
@include xs-to-sm {
350+
@include upto-sm {
351351
width: 100%;
352352
display: block;
353353
margin-bottom: 0;
@@ -358,7 +358,7 @@
358358
flex-direction: column;
359359
margin-right: 10px;
360360

361-
@include xs-to-sm {
361+
@include upto-sm {
362362
display: block;
363363
padding-bottom: 10px;
364364
}
@@ -425,7 +425,7 @@
425425
}
426426
}
427427

428-
@include xs-to-sm {
428+
@include upto-sm {
429429
width: 100%;
430430
}
431431
}
@@ -561,7 +561,7 @@
561561
flex-flow: row wrap;
562562
border-bottom: none;
563563

564-
@include xs-to-sm {
564+
@include upto-sm {
565565
display: block;
566566
padding: 0 20px;
567567
}
@@ -795,7 +795,7 @@
795795
}
796796
}
797797

798-
@include xs-to-sm {
798+
@include upto-sm {
799799
padding: 20px;
800800
}
801801
}
@@ -824,7 +824,7 @@
824824
color: $tc-black;
825825
margin-bottom: 20px;
826826

827-
@include xs-to-sm {
827+
@include upto-sm {
828828
display: none;
829829
}
830830
}
@@ -839,7 +839,7 @@
839839
margin-bottom: 30px;
840840
margin-top: 10px;
841841

842-
@include xs-to-sm {
842+
@include upto-sm {
843843
display: none;
844844
}
845845
}
@@ -848,7 +848,7 @@
848848
.button-save {
849849
align-self: center;
850850

851-
@include xs-to-sm {
851+
@include upto-sm {
852852
margin-top: 10px;
853853
width: 156px;
854854
}
@@ -895,7 +895,7 @@
895895
width: 155px;
896896
}
897897

898-
@include xs-to-sm {
898+
@include upto-sm {
899899
display: none;
900900
}
901901
}

‎src/shared/components/Settings/Account/MyAccount/styles.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
flex-direction: column;
1010
align-items: left;
1111

12-
@include xs-to-sm {
12+
@include upto-sm {
1313
padding: 20px;
1414
}
1515

@@ -22,7 +22,7 @@
2222
color: $tc-black;
2323
margin-bottom: 20px;
2424

25-
@include xs-to-sm {
25+
@include upto-sm {
2626
display: none;
2727
}
2828
}
@@ -37,7 +37,7 @@
3737
margin-top: 10px;
3838
margin-bottom: 30px;
3939

40-
@include xs-to-sm {
40+
@include upto-sm {
4141
display: none;
4242
}
4343
}
@@ -63,15 +63,15 @@
6363
.form-default {
6464
display: block;
6565

66-
@include xs-to-sm {
66+
@include upto-sm {
6767
display: none;
6868
}
6969
}
7070

7171
.form-mobile {
7272
display: none;
7373

74-
@include xs-to-sm {
74+
@include upto-sm {
7575
display: block;
7676

7777
.row {
@@ -156,7 +156,7 @@
156156
justify-content: flex-start;
157157

158158
.field {
159-
@include xs-to-sm {
159+
@include upto-sm {
160160
display: block;
161161
padding-bottom: 10px;
162162
}
@@ -169,7 +169,7 @@
169169
font-weight: 700;
170170
color: $tc-gray-80;
171171

172-
@include xs-to-sm {
172+
@include upto-sm {
173173
@include roboto-regular;
174174

175175
font-size: 12px;
@@ -333,7 +333,7 @@
333333
.password-section {
334334
margin-top: 20px;
335335

336-
@include xs-to-sm {
336+
@include upto-sm {
337337
display: none;
338338
}
339339
}
@@ -506,7 +506,7 @@ $tips-background: $tc-gray-neutral-light;
506506
text-align: left;
507507
margin-top: 10px;
508508

509-
@include xs-to-sm {
509+
@include upto-sm {
510510
margin-top: 0;
511511
margin-bottom: 10px;
512512
margin-left: auto;
@@ -573,7 +573,7 @@ $tips-background: $tc-gray-neutral-light;
573573
display: block;
574574
}
575575

576-
@include xs-to-sm {
576+
@include upto-sm {
577577
display: none;
578578

579579
&.mobile {

‎src/shared/components/Settings/Account/styles.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
.mobile-view {
1010
display: none;
1111

12-
@include md-to-lg {
12+
@include from-sm-to-lg {
1313
display: none;
1414
}
1515

16-
@include xs-to-sm {
16+
@include upto-sm {
1717
display: block;
1818
width: 100%;
1919
}
@@ -25,13 +25,13 @@
2525
padding: 30px;
2626
border-bottom-left-radius: 6px;
2727

28-
@include md-to-lg {
28+
@include from-sm-to-lg {
2929
width: 90px;
3030
padding-right: 30px;
3131
margin-right: 0;
3232
}
3333

34-
@include xs-to-sm {
34+
@include upto-sm {
3535
display: none;
3636
}
3737
}
@@ -40,7 +40,7 @@
4040
flex: 1;
4141
padding: 30px 80px;
4242

43-
@include xs-to-sm {
43+
@include upto-sm {
4444
display: none;
4545
}
4646
}

‎src/shared/components/Settings/Preferences/Email/styles.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
margin-bottom: 25px;
88

9-
@include xs-to-sm {
9+
@include upto-sm {
1010
font-size: 20px;
1111
line-height: 30px;
1212
margin: 20px;
@@ -23,7 +23,7 @@
2323
margin-bottom: 30px;
2424
margin-top: 5px;
2525

26-
@include xs-to-sm {
26+
@include upto-sm {
2727
display: none;
2828
}
2929
}

‎src/shared/components/Settings/Preferences/Personalization/styles.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
.Personalization {
44
margin-bottom: 60px;
55

6-
@include md-to-lg {
6+
@include from-sm-to-lg {
77
margin-bottom: 0;
88
}
99

10-
@include xs-to-sm {
10+
@include upto-sm {
1111
margin-bottom: 0;
1212
}
1313

@@ -16,7 +16,7 @@
1616

1717
margin-bottom: 25px;
1818

19-
@include xs-to-sm {
19+
@include upto-sm {
2020
font-size: 20px;
2121
line-height: 30px;
2222
margin: 20px;
@@ -27,7 +27,7 @@
2727
border-top: 1px solid $tc-gray-neutral-dark;
2828
min-height: 474px;
2929

30-
@include xs-to-sm {
30+
@include upto-sm {
3131
min-height: 1px;
3232
}
3333
}

‎src/shared/components/Settings/Preferences/styles.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
flex-direction: row;
66
box-shadow: 0 2px 9px 0 rgba(38, 38, 40, 0.06);
77

8-
@include xs-to-sm {
8+
@include upto-sm {
99
padding: 0;
1010
}
1111

1212
.mobile-view {
1313
display: none;
1414

15-
@include md-to-lg {
15+
@include from-sm-to-lg {
1616
display: none;
1717
}
1818

19-
@include xs-to-sm {
19+
@include upto-sm {
2020
display: block;
2121
width: 100%;
2222
}
@@ -28,13 +28,13 @@
2828
padding: 30px;
2929
border-bottom-left-radius: 6px;
3030

31-
@include md-to-lg {
31+
@include from-sm-to-lg {
3232
width: 90px;
3333
padding-right: 30px;
3434
margin-right: 0;
3535
}
3636

37-
@include xs-to-sm {
37+
@include upto-sm {
3838
display: none;
3939
}
4040
}
@@ -43,7 +43,7 @@
4343
flex: 1;
4444
padding: 30px 80px;
4545

46-
@include xs-to-sm {
46+
@include upto-sm {
4747
display: none;
4848
}
4949
}

‎src/shared/components/Settings/Profile/BasicInfo/ImageInput/styles.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "../../../style";
22

33
.image {
4-
@include xs-to-sm {
4+
@include upto-sm {
55
display: none;
66
}
77

@@ -12,7 +12,7 @@
1212
p.handle {
1313
display: none;
1414

15-
@include xs-to-sm {
15+
@include upto-sm {
1616
@include roboto-regular;
1717

1818
display: block;
@@ -31,7 +31,7 @@
3131
height: 120px;
3232
padding: 2px;
3333

34-
@include xs-to-sm {
34+
@include upto-sm {
3535
width: 80px;
3636
height: 80px;
3737
margin-right: 10px;

0 commit comments

Comments
 (0)