Skip to content

Commit ddb5b36

Browse files
Merge pull request htmlacademy#40 from htmlacademy/feature/normalize
Обновляет normalize до последней версии
2 parents 41b341a + b08f107 commit ddb5b36

File tree

1 file changed

+44
-122
lines changed

1 file changed

+44
-122
lines changed

css/normalize.css

Lines changed: 44 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1-
/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */
1+
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
22

33
/* Document
44
========================================================================== */
55

66
/**
77
* 1. Correct the line height in all browsers.
8-
* 2. Prevent adjustments of font size after orientation changes in
9-
* IE on Windows Phone and in iOS.
8+
* 2. Prevent adjustments of font size after orientation changes in iOS.
109
*/
1110

1211
html {
1312
line-height: 1.15; /* 1 */
14-
-ms-text-size-adjust: 100%; /* 2 */
1513
-webkit-text-size-adjust: 100%; /* 2 */
1614
}
1715

1816
/* Sections
1917
========================================================================== */
2018

2119
/**
22-
* Add the correct display in IE 9-.
20+
* Remove the margin in all browsers.
2321
*/
2422

25-
article,
26-
aside,
27-
footer,
28-
header,
29-
nav,
30-
section {
23+
body {
24+
margin: 0;
25+
}
26+
27+
/**
28+
* Render the `main` element consistently in IE.
29+
*/
30+
31+
main {
3132
display: block;
3233
}
3334

@@ -44,25 +45,6 @@ h1 {
4445
/* Grouping content
4546
========================================================================== */
4647

47-
/**
48-
* Add the correct display in IE 9-.
49-
* 1. Add the correct display in IE.
50-
*/
51-
52-
figcaption,
53-
figure,
54-
main { /* 1 */
55-
display: block;
56-
}
57-
58-
/**
59-
* Add the correct margin in IE 8.
60-
*/
61-
62-
figure {
63-
margin: 1em 40px;
64-
}
65-
6648
/**
6749
* 1. Add the correct box sizing in Firefox.
6850
* 2. Show the overflow in Edge and IE.
@@ -88,17 +70,15 @@ pre {
8870
========================================================================== */
8971

9072
/**
91-
* 1. Remove the gray background on active links in IE 10.
92-
* 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
73+
* Remove the gray background on active links in IE 10.
9374
*/
9475

9576
a {
96-
background-color: transparent; /* 1 */
97-
-webkit-text-decoration-skip: objects; /* 2 */
77+
background-color: transparent;
9878
}
9979

10080
/**
101-
* 1. Remove the bottom border in Chrome 57- and Firefox 39-.
81+
* 1. Remove the bottom border in Chrome 57-
10282
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
10383
*/
10484

@@ -108,15 +88,6 @@ abbr[title] {
10888
text-decoration: underline dotted; /* 2 */
10989
}
11090

111-
/**
112-
* Prevent the duplicate application of `bolder` by the next rule in Safari 6.
113-
*/
114-
115-
b,
116-
strong {
117-
font-weight: inherit;
118-
}
119-
12091
/**
12192
* Add the correct font weight in Chrome, Edge, and Safari.
12293
*/
@@ -138,23 +109,6 @@ samp {
138109
font-size: 1em; /* 2 */
139110
}
140111

141-
/**
142-
* Add the correct font style in Android 4.3-.
143-
*/
144-
145-
dfn {
146-
font-style: italic;
147-
}
148-
149-
/**
150-
* Add the correct background and color in IE 9-.
151-
*/
152-
153-
mark {
154-
background-color: #ff0;
155-
color: #000;
156-
}
157-
158112
/**
159113
* Add the correct font size in all browsers.
160114
*/
@@ -188,52 +142,30 @@ sup {
188142
========================================================================== */
189143

190144
/**
191-
* Add the correct display in IE 9-.
192-
*/
193-
194-
audio,
195-
video {
196-
display: inline-block;
197-
}
198-
199-
/**
200-
* Add the correct display in iOS 4-7.
201-
*/
202-
203-
audio:not([controls]) {
204-
display: none;
205-
height: 0;
206-
}
207-
208-
/**
209-
* Remove the border on images inside links in IE 10-.
145+
* Remove the border on images inside links in IE 10.
210146
*/
211147

212148
img {
213149
border-style: none;
214150
}
215151

216-
/**
217-
* Hide the overflow in IE.
218-
*/
219-
220-
svg:not(:root) {
221-
overflow: hidden;
222-
}
223-
224152
/* Forms
225153
========================================================================== */
226154

227155
/**
228-
* Remove the margin in Firefox and Safari.
156+
* 1. Change the font styles in all browsers.
157+
* 2. Remove the margin in Firefox and Safari.
229158
*/
230159

231160
button,
232161
input,
233162
optgroup,
234163
select,
235164
textarea {
236-
margin: 0;
165+
font-family: inherit; /* 1 */
166+
font-size: 100%; /* 1 */
167+
line-height: 1.15; /* 1 */
168+
margin: 0; /* 2 */
237169
}
238170

239171
/**
@@ -257,16 +189,14 @@ select { /* 1 */
257189
}
258190

259191
/**
260-
* 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
261-
* controls in Android 4.
262-
* 2. Correct the inability to style clickable types in iOS and Safari.
192+
* Correct the inability to style clickable types in iOS and Safari.
263193
*/
264194

265195
button,
266-
html [type="button"], /* 1 */
196+
[type="button"],
267197
[type="reset"],
268198
[type="submit"] {
269-
-webkit-appearance: button; /* 2 */
199+
-webkit-appearance: button;
270200
}
271201

272202
/**
@@ -292,6 +222,14 @@ button:-moz-focusring,
292222
outline: 1px dotted ButtonText;
293223
}
294224

225+
/**
226+
* Correct the padding in Firefox.
227+
*/
228+
229+
fieldset {
230+
padding: 0.35em 0.75em 0.625em;
231+
}
232+
295233
/**
296234
* 1. Correct the text wrapping in Edge and IE.
297235
* 2. Correct the color inheritance from `fieldset` elements in IE.
@@ -309,26 +247,24 @@ legend {
309247
}
310248

311249
/**
312-
* 1. Add the correct display in IE 9-.
313-
* 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
250+
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
314251
*/
315252

316253
progress {
317-
display: inline-block; /* 1 */
318-
vertical-align: baseline; /* 2 */
254+
vertical-align: baseline;
319255
}
320256

321257
/**
322-
* Remove the default vertical scrollbar in IE.
258+
* Remove the default vertical scrollbar in IE 10+.
323259
*/
324260

325261
textarea {
326262
overflow: auto;
327263
}
328264

329265
/**
330-
* 1. Add the correct box sizing in IE 10-.
331-
* 2. Remove the padding in IE 10-.
266+
* 1. Add the correct box sizing in IE 10.
267+
* 2. Remove the padding in IE 10.
332268
*/
333269

334270
[type="checkbox"],
@@ -357,10 +293,9 @@ textarea {
357293
}
358294

359295
/**
360-
* Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
296+
* Remove the inner padding in Chrome and Safari on macOS.
361297
*/
362298

363-
[type="search"]::-webkit-search-cancel-button,
364299
[type="search"]::-webkit-search-decoration {
365300
-webkit-appearance: none;
366301
}
@@ -379,12 +314,10 @@ textarea {
379314
========================================================================== */
380315

381316
/*
382-
* Add the correct display in IE 9-.
383-
* 1. Add the correct display in Edge, IE, and Firefox.
317+
* Add the correct display in Edge, IE 10+, and Firefox.
384318
*/
385319

386-
details, /* 1 */
387-
menu {
320+
details {
388321
display: block;
389322
}
390323

@@ -396,30 +329,19 @@ summary {
396329
display: list-item;
397330
}
398331

399-
/* Scripting
332+
/* Misc
400333
========================================================================== */
401334

402335
/**
403-
* Add the correct display in IE 9-.
404-
*/
405-
406-
canvas {
407-
display: inline-block;
408-
}
409-
410-
/**
411-
* Add the correct display in IE.
336+
* Add the correct display in IE 10+.
412337
*/
413338

414339
template {
415340
display: none;
416341
}
417342

418-
/* Hidden
419-
========================================================================== */
420-
421343
/**
422-
* Add the correct display in IE 10-.
344+
* Add the correct display in IE 10.
423345
*/
424346

425347
[hidden] {

0 commit comments

Comments
 (0)