From ad1ae7ce150a5bbaf5c8eddfb35d426591f7a096 Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Tue, 28 Dec 2021 17:20:44 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20sticky-footer=20(#63)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/style.css b/css/style.css index 3bd53e6..a125c80 100644 --- a/css/style.css +++ b/css/style.css @@ -8,15 +8,19 @@ html { scroll-behavior: smooth; + height: 100%; } body { margin: 0; + min-height: 100%; font-size: 16px; line-height: 1.6; font-family: "Helvetica", "Arial", sans-serif; color: #5a5a5a; background-color: #ffffff; + display: flex; + flex-direction: column; } a:link, @@ -373,6 +377,7 @@ header a:visited { footer { padding: 2rem; + margin-top: auto; background-color: #2d2d44; } From 522f0f7ece0122a0969f61ebdc625ee0bbdfe301 Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Tue, 28 Dec 2021 17:20:52 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5=D1=82?= =?UTF-8?q?=20normalize=20(#64)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/normalize.css | 349 ---------------------------------------------- html-css.html | 1 - index.html | 1 - javascript.html | 1 - 4 files changed, 352 deletions(-) delete mode 100644 css/normalize.css diff --git a/css/normalize.css b/css/normalize.css deleted file mode 100644 index 192eb9c..0000000 --- a/css/normalize.css +++ /dev/null @@ -1,349 +0,0 @@ -/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ - -/* Document - ========================================================================== */ - -/** - * 1. Correct the line height in all browsers. - * 2. Prevent adjustments of font size after orientation changes in iOS. - */ - -html { - line-height: 1.15; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ -} - -/* Sections - ========================================================================== */ - -/** - * Remove the margin in all browsers. - */ - -body { - margin: 0; -} - -/** - * Render the `main` element consistently in IE. - */ - -main { - display: block; -} - -/** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/* Grouping content - ========================================================================== */ - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -pre { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/* Text-level semantics - ========================================================================== */ - -/** - * Remove the gray background on active links in IE 10. - */ - -a { - background-color: transparent; -} - -/** - * 1. Remove the bottom border in Chrome 57- - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ - -abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ -} - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ - -b, -strong { - font-weight: bolder; -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -code, -kbd, -samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/** - * Add the correct font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* Embedded content - ========================================================================== */ - -/** - * Remove the border on images inside links in IE 10. - */ - -img { - border-style: none; -} - -/* Forms - ========================================================================== */ - -/** - * 1. Change the font styles in all browsers. - * 2. Remove the margin in Firefox and Safari. - */ - -button, -input, -optgroup, -select, -textarea { - font-family: inherit; /* 1 */ - font-size: 100%; /* 1 */ - line-height: 1.15; /* 1 */ - margin: 0; /* 2 */ -} - -/** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - */ - -button, -input { /* 1 */ - overflow: visible; -} - -/** - * Remove the inheritance of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritance of text transform in Firefox. - */ - -button, -select { /* 1 */ - text-transform: none; -} - -/** - * Correct the inability to style clickable types in iOS and Safari. - */ - -button, -[type="button"], -[type="reset"], -[type="submit"] { - -webkit-appearance: button; -} - -/** - * Remove the inner border and padding in Firefox. - */ - -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} - -/** - * Restore the focus styles unset by the previous rule. - */ - -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} - -/** - * Correct the padding in Firefox. - */ - -fieldset { - padding: 0.35em 0.75em 0.625em; -} - -/** - * 1. Correct the text wrapping in Edge and IE. - * 2. Correct the color inheritance from `fieldset` elements in IE. - * 3. Remove the padding so developers are not caught out when they zero out - * `fieldset` elements in all browsers. - */ - -legend { - box-sizing: border-box; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ -} - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ - -progress { - vertical-align: baseline; -} - -/** - * Remove the default vertical scrollbar in IE 10+. - */ - -textarea { - overflow: auto; -} - -/** - * 1. Add the correct box sizing in IE 10. - * 2. Remove the padding in IE 10. - */ - -[type="checkbox"], -[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ - -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Correct the odd appearance in Chrome and Safari. - * 2. Correct the outline style in Safari. - */ - -[type="search"] { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} - -/** - * Remove the inner padding in Chrome and Safari on macOS. - */ - -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * 1. Correct the inability to style clickable types in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ - -::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} - -/* Interactive - ========================================================================== */ - -/* - * Add the correct display in Edge, IE 10+, and Firefox. - */ - -details { - display: block; -} - -/* - * Add the correct display in all browsers. - */ - -summary { - display: list-item; -} - -/* Misc - ========================================================================== */ - -/** - * Add the correct display in IE 10+. - */ - -template { - display: none; -} - -/** - * Add the correct display in IE 10. - */ - -[hidden] { - display: none; -} diff --git a/html-css.html b/html-css.html index cb8db70..02afb73 100644 --- a/html-css.html +++ b/html-css.html @@ -12,7 +12,6 @@ - diff --git a/index.html b/index.html index 5df2a0b..e1c162d 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,6 @@ - diff --git a/javascript.html b/javascript.html index e3917bc..64f8089 100644 --- a/javascript.html +++ b/javascript.html @@ -12,7 +12,6 @@ - From 9952b013ed8e86f83bb1cbb86105580367c96bc1 Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Tue, 28 Dec 2021 17:21:00 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=A7=D0=B8=D0=BD=D0=B8=D1=82=20target=3D"?= =?UTF-8?q?=5Fblank"=20(#65)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html-css.html | 12 ++++++------ index.html | 10 +++++----- javascript.html | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/html-css.html b/html-css.html index 02afb73..eaf18aa 100644 --- a/html-css.html +++ b/html-css.html @@ -581,7 +581,7 @@

Подключение скриптов

Валидность

- Документ проходит проверку на валидность. Для проверки используется современный валидатор. + Документ проходит проверку на валидность. Для проверки используется современный валидатор.

@@ -1077,21 +1077,21 @@

Порядок свойств

HTML Academy
- + GitHub
diff --git a/index.html b/index.html index e1c162d..275e707 100644 --- a/index.html +++ b/index.html @@ -63,21 +63,21 @@ HTML Academy
- + GitHub
diff --git a/javascript.html b/javascript.html index 64f8089..cf17b2d 100644 --- a/javascript.html +++ b/javascript.html @@ -96,7 +96,7 @@

Синтаксис

Отступы, пробелы и переносы

-
Для правильного форматирования используйте файл .editorconfig в вашем редакторе.
+
Для правильного форматирования используйте файл .editorconfig в вашем редакторе.

Для отступов используются два пробела. Знак табуляции не используется

@@ -247,7 +247,7 @@

Именование

Запрещено использовать имена переменных, которые используются во внешних областях видимости

-

Запрещено называть переменные и свойства ключевыми словами JS

+

Запрещено называть переменные и свойства ключевыми словами JS

Запрещено использовать переменные, не объявленные ранее. При использовании переменной, объявленной в другом модуле в глобальной области видимости, нужно обращаться к ней как к свойству объекта window

@@ -287,7 +287,7 @@

Условные операторы

В условиях не используется небезопасное отрицание, например использование ! в in или instanceof без скобок

-

Запрещено сравнение с NaN. Для проверки, является ли результат операции числовым, нужно использовать Number.isNaN

+

Запрещено сравнение с NaN. Для проверки, является ли результат операции числовым, нужно использовать Number.isNaN

Запрещено использовать case без break или return в блоках switch

@@ -555,21 +555,21 @@

Регулярные выражения

HTML Academy
- + GitHub
From 4c72ae2ad97db5db885a87a99da0b1700d43e242 Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Wed, 29 Dec 2021 17:53:46 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=86=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20(#67)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html-css.html | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/html-css.html b/html-css.html index eaf18aa..dd6df48 100644 --- a/html-css.html +++ b/html-css.html @@ -668,7 +668,7 @@

Структура объявления

.block{margin-bottom: 0; margin-top: 0; font-size: 14px;line-height: 20; - color :red} + color :#ff0000} .element { background-color: #000000; } @@ -786,12 +786,12 @@

Кавычки

/* Хорошо */
 .field[type="text"] {
-  background-color: url("http://github.com/images/cat.jpg");
+  background-image: url("http://github.com/images/cat.jpg");
 }
 
 /* Плохо */
 .field[type=text] {
-  background-color: url(http://github.com/images/cat.jpg);
+  background-image: url(http://github.com/images/cat.jpg);
 }
@@ -815,11 +815,6 @@

Ведущий ноль и пробелы после background-color: rgba(0, 0, 0, 0.5); } -.element { - background-color: rgb(0, 0, 0); - color: rgba(0, 0, 0, 0.5); -} - /* Плохо */ .block { opacity: .5; @@ -827,7 +822,6 @@

Ведущий ноль и пробелы после } .element { - background-color: rgb(0,0,0); color: rgba(0 ,0 ,0 ,0.5); } From ca5ef8642c24f32d8867c8b3ffbc14bd176ea095 Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Wed, 12 Jan 2022 22:19:00 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=90=D0=BA=D0=B0=D0=B4=D0=B5=D0=BC=D0=B8=D0=B8=20(#6?= =?UTF-8?q?8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html-css.html | 6 +++--- index.html | 6 +++--- javascript.html | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/html-css.html b/html-css.html index dd6df48..db77366 100644 --- a/html-css.html +++ b/html-css.html @@ -2,14 +2,14 @@ - Стиль кода Академии HTML + Стиль кода HTML Academy - + @@ -27,7 +27,7 @@ -

Стиль кода Академии HTML

+

Стиль кода HTML Academy

github.com/htmlacademy/codeguide

diff --git a/index.html b/index.html index 275e707..e8fc7e6 100644 --- a/index.html +++ b/index.html @@ -2,14 +2,14 @@ - Стиль кода Академии HTML + Стиль кода HTML Academy - + @@ -28,7 +28,7 @@ -

Стиль кода Академии HTML

+

Стиль кода HTML Academy

github.com/htmlacademy/codeguide

diff --git a/javascript.html b/javascript.html index cf17b2d..62bf3b1 100644 --- a/javascript.html +++ b/javascript.html @@ -2,14 +2,14 @@ - Стиль кода Академии HTML + Стиль кода HTML Academy - + @@ -35,7 +35,7 @@ -

Стиль кода Академии HTML

+

Стиль кода HTML Academy

github.com/htmlacademy/codeguide

From f56ac575f488c1f2cfa407775adfaa1e0a8ca40d Mon Sep 17 00:00:00 2001 From: artem-ns2 Date: Thu, 10 Feb 2022 17:18:43 +0500 Subject: [PATCH 6/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D1=83=20?= =?UTF-8?q?=D0=BD=D0=B0=20Primer=20Guidelines=20=D0=BE=D1=82=20GitHub=20(#?= =?UTF-8?q?71)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 871bf7a..947d906 100644 --- a/Readme.md +++ b/Readme.md @@ -7,7 +7,7 @@ * [Code Guide](http://codeguide.co) by @mdo * [CSS Guidelines](http://cssguidelin.es) by Harry Roberts * [Idiomatic CSS](https://github.com/necolas/idiomatic-css) by Nicolas Gallagher -* [Primer Guidelines](https://styleguide.github.com/primer/principles/) by GitHub +* [Primer Guidelines](https://primer.style/css/) by GitHub ## Лицензия From d8665abb284a3a7ca93c7ed05e4fdc2f143afc23 Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Wed, 28 Jun 2023 19:51:29 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=A3=D1=82=D0=BE=D1=87=D0=BD=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html-css.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/html-css.html b/html-css.html index db77366..8e52a6a 100644 --- a/html-css.html +++ b/html-css.html @@ -212,7 +212,7 @@

Базовые части разметки

  • Корневой элемент <html> с языком документа lang
  • Метаинформация <head>
  • Заголовок документа <title>
    • -
  • Кодировка документа <meta charset="utf-8">. Кодировка символов на странице явно указана, чтобы обеспечить корректное отображение текста. Кодировка utf-8 предпочтительна.
    • +
  • Кодировка документа <meta charset="utf-8">. Кодировка символов на странице явно указана, чтобы обеспечить корректное отображение текста.
  • Тело документа <body>

    • @@ -234,6 +234,14 @@

    Базовые части разметки

    <title>Заголовок</title> Страница </html> + +<!-- Плохо --> +<!DOCTYPE html> +<html lang="ru"> + <head> + <meta charset="windows-1251"> + </head> +</html>