Skip to content

Commit 0bdb9b0

Browse files
authored
Merge pull request #29 from fs-jun24-team-3/feature/fix-footer
Fixed footer height
2 parents 16ebd0a + f4031f7 commit 0bdb9b0

File tree

3 files changed

+25
-16
lines changed

3 files changed

+25
-16
lines changed

src/components/Footer/Footer.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
.footer {
22
border-top: 1px solid $elemnts-color;
3-
font-size: 12px;
4-
background-color: #fff;
3+
background-color: $white-color;
54

6-
@include onMobile {
7-
height: 257px;
8-
padding: 32px 16px;
9-
}
105
@include onTablet {
116
height: 96px;
127
}
138

9+
@include onDesktop {
10+
height: 96px;
11+
padding: 32px 16px;
12+
}
13+
1414
&__container {
1515
height: 100%;
1616
@include container;
@@ -21,9 +21,6 @@
2121
@include onTablet {
2222
flex-direction: row;
2323
}
24-
25-
@include onDesktop {
26-
}
2724
}
2825

2926
&__logo {
@@ -42,11 +39,8 @@
4239
line-height: 11px;
4340
letter-spacing: 4%;
4441
color: $secondary-color;
45-
4642
display: flex;
47-
4843
align-items: center;
49-
5044
width: 100%;
5145
justify-content: center;
5246

@@ -56,6 +50,12 @@
5650
width: 200px;
5751
}
5852

53+
&-text {
54+
font-size: pxToRem(12);
55+
font-weight: 700;
56+
line-height: 16px;
57+
}
58+
5959
&-icon {
6060
width: 32px;
6161
height: 32px;

src/components/Footer/NavFooter/NavFooter.scss

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,32 @@
88
flex-direction: column;
99
align-items: flex-start;
1010
gap: 16px;
11+
margin-top: 32px;
12+
margin-bottom: 32px;
1113

1214
@include onTablet {
1315
flex-direction: row;
1416
align-items: center;
1517
}
18+
19+
@include onDesktop {
20+
gap: 106px;
21+
}
1622
}
1723

1824
&__link {
1925
text-decoration: none;
2026
color: inherit;
2127
text-transform: uppercase;
2228
font-weight: 800;
23-
font-size: 12px;
29+
font-size: pxToRem(12);
2430
line-height: 11px;
25-
letter-spacing: 4%;
26-
color: #89939a;
31+
letter-spacing: 0.04em;
32+
color: $secondary-color;
2733
flex: 1;
2834
text-align: center;
2935
}
36+
37+
@include onTablet {
38+
}
3039
}

src/styles/utils/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ body {
5757

5858
.footer {
5959
// background-color: lightgray;
60-
padding: 20px;
60+
padding: 0px;
6161
text-align: center;
6262
}

0 commit comments

Comments
 (0)