Skip to content

Commit cf86bfa

Browse files
authored
Merge pull request #1 from SvetlanaKudryavtseva/main
max-width typos in section class variables on lines 67 and 70
2 parents f37cab0 + 84dd612 commit cf86bfa

File tree

1 file changed

+73
-73
lines changed

1 file changed

+73
-73
lines changed

src/assets/scss/main.scss

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
@import 'utils/vars';
22
@import 'utils/reset';
3-
43
html {
5-
line-height: $mainLineHeight;
6-
font-size: $mainFontSize;
7-
color: $mainFontColor;
8-
height: 100%;
9-
@media screen and (max-width: $desktopWidth) {
10-
font-size: 16px;
11-
}
12-
@media screen and (max-width: $tableWidth) {
13-
font-size: 15px;
14-
}
15-
@media screen and (max-width: $phoneWidth) {
16-
font-size: 14px;
17-
}
4+
line-height: $mainLineHeight;
5+
font-size: $mainFontSize;
6+
color: $mainFontColor;
7+
height: 100%;
8+
@media screen and (max-width: $desktopWidth) {
9+
font-size: 16px;
10+
}
11+
@media screen and (max-width: $tableWidth) {
12+
font-size: 15px;
13+
}
14+
@media screen and (max-width: $phoneWidth) {
15+
font-size: 14px;
16+
}
1817
}
1918

2019
body {
21-
font-family: $mainFont;
22-
font-size: $mainFontSize;
23-
font-weight: $mainFontWeight;
24-
-webkit-font-smoothing: antialiased;
25-
-moz-osx-font-smoothing: grayscale;
26-
margin: 0;
27-
padding: 0;
28-
// background-color: #f7f7f7;
20+
font-family: $mainFont;
21+
font-size: $mainFontSize;
22+
font-weight: $mainFontWeight;
23+
-webkit-font-smoothing: antialiased;
24+
-moz-osx-font-smoothing: grayscale;
25+
margin: 0;
26+
padding: 0;
27+
// background-color: #f7f7f7;
2928
}
3029

3130
*,
3231
*:before,
3332
*:after {
34-
box-sizing: border-box;
33+
box-sizing: border-box;
3534
}
3635

3736
h1,
@@ -40,80 +39,81 @@ h3,
4039
h4,
4140
h5,
4241
h6 {
43-
margin: 0;
42+
margin: 0;
4443
}
4544

4645
a {
47-
text-decoration: none;
46+
text-decoration: none;
4847
}
4948

5049
ul,
5150
li {
52-
list-style-type: none;
53-
margin: 0;
54-
padding: 0;
51+
list-style-type: none;
52+
margin: 0;
53+
padding: 0;
5554
}
5655

5756
footer {
58-
margin-top: 60px;
57+
margin-top: 60px;
5958
}
59+
6060
section,
6161
.section {
62-
position: relative;
63-
padding: 40px 0;
64-
@media screen and (max-width: $desktopWidth) {
65-
padding: 36px 0;
66-
}
67-
@media screen and (max-width: $desktopWidth) {
68-
padding: 28px 0;
69-
}
70-
@media screen and (max-width: $desktopWidth) {
71-
padding: 20px 0;
72-
}
62+
position: relative;
63+
padding: 40px 0;
64+
@media screen and (max-width: $desktopWidth) {
65+
padding: 36px 0;
66+
}
67+
@media screen and (max-width: $tableWidth) {
68+
padding: 28px 0;
69+
}
70+
@media screen and (max-width: $phoneWidth) {
71+
padding: 20px 0;
72+
}
7373
}
7474

7575
.wrapper {
76-
display: flex;
77-
flex-direction: column;
78-
min-height: 100vh;
79-
margin: 0 auto;
76+
display: flex;
77+
flex-direction: column;
78+
min-height: 100vh;
79+
margin: 0 auto;
8080
}
8181

8282
.wrapper-content {
83-
display: flex;
84-
flex-direction: column;
85-
min-height: 70vh;
86-
margin-top: 40px; // if header is fixed do 40px+headerHeight
83+
display: flex;
84+
flex-direction: column;
85+
min-height: 70vh;
86+
margin-top: 40px; // if header is fixed do 40px+headerHeight
8787
}
8888

8989
.container {
90-
position: relative;
91-
flex: 0 0 auto;
92-
margin: 0 auto;
93-
width: 100%;
94-
max-width: $lgDesktopWidth;
95-
@media screen and (max-width: $lgDesktopWidth) {
96-
padding: 0 16px;
97-
}
98-
@media screen and (max-width: $smDesktopWidth) {
99-
max-width: $tableWidth;
100-
}
101-
@media screen and (max-width: $tableWidth) {
102-
max-width: $smTableWidth;
103-
}
104-
@media screen and (max-width: $smTableWidth) {
105-
max-width: $phoneWidth;
106-
}
107-
@media screen and (max-width: $phoneWidth) {
108-
max-width: $smPhoneWidth;
109-
}
90+
position: relative;
91+
flex: 0 0 auto;
92+
margin: 0 auto;
93+
width: 100%;
94+
max-width: $lgDesktopWidth;
95+
@media screen and (max-width: $lgDesktopWidth) {
96+
padding: 0 16px;
97+
}
98+
@media screen and (max-width: $smDesktopWidth) {
99+
max-width: $tableWidth;
100+
}
101+
@media screen and (max-width: $tableWidth) {
102+
max-width: $smTableWidth;
103+
}
104+
@media screen and (max-width: $smTableWidth) {
105+
max-width: $phoneWidth;
106+
}
107+
@media screen and (max-width: $phoneWidth) {
108+
max-width: $smPhoneWidth;
109+
}
110110
}
111111

112112
.view {
113-
width: 100%;
114-
max-width: 700px;
115-
margin-left: auto;
116-
margin-right: auto;
113+
width: 100%;
114+
max-width: 700px;
115+
margin-left: auto;
116+
margin-right: auto;
117117
}
118118

119-
@import './common/_common';
119+
@import './common/_common';

0 commit comments

Comments
 (0)