From 1fdf59bb623dc65a64497f7440b76608a31be566 Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Thu, 16 Sep 2021 17:10:22 +0300 Subject: [PATCH 01/23] =?UTF-8?q?=D0=9C=D0=B5=D0=BD=D1=8F=D0=B5=D1=82=20HT?= =?UTF-8?q?ML-=D0=BB=D0=B8=D0=BD=D1=82=D0=B5=D1=80=20=D0=BD=D0=B0=20=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html-css.html b/html-css.html index c468d5f..611d0cd 100644 --- a/html-css.html +++ b/html-css.html @@ -99,7 +99,7 @@

Автоматизация проверки кода

При написании кода вам сложно будет запомнить все правила кодгайда. Эту работу стоит отдать роботам.

По ссылкам находятся конфигурации Академии для этих инструментов. Конфигурации частично покрывают то, что описано в этом стиле кода, и в них нет ничего, что не описано ниже.

From d4780806bb6fbf643fcc522552e0b296bb0a1c18 Mon Sep 17 00:00:00 2001 From: Alexey Kovalev Date: Wed, 27 Oct 2021 06:59:19 +0300 Subject: [PATCH 02/23] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=BA=D1=83=20(#62)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: aikovalev --- html-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html-css.html b/html-css.html index 611d0cd..eff6a65 100644 --- a/html-css.html +++ b/html-css.html @@ -451,7 +451,7 @@

Размеры замещаемых элементов
  • У изображений, видео и iframe указаны размеры.
    • -
  • о возможности изображениям указываются действительные размеры, так как это улучшает производительность отрисовки страницы: браузер не будет перерисовывать страницу в процессе загрузки и отображения изображения.
    • +
  • По возможности изображениям указываются действительные размеры, так как это улучшает производительность отрисовки страницы: браузер не будет перерисовывать страницу в процессе загрузки и отображения изображения.
  • В атрибутах нет единиц измерения.
    • From 7adb72522db00583b0a94be9a6f2ca4d22c7ccfb Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:04:35 +0300 Subject: [PATCH 03/23] =?UTF-8?q?=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D0=B8=D1=82=20=D0=BA=D0=BE=D0=B4=20=D0=BF=D0=BE=20=D0=B1?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/chapter.css | 94 +++++++ css/blocks/code.css | 31 +++ css/blocks/common.css | 92 +++++++ css/blocks/footer.css | 67 +++++ css/blocks/guide-content.css | 4 + css/blocks/header.css | 44 +++ css/blocks/logo-list.css | 19 ++ css/blocks/prism.css | 49 ++++ css/blocks/sidebar.css | 118 ++++++++ css/style.css | 502 +---------------------------------- 10 files changed, 527 insertions(+), 493 deletions(-) create mode 100644 css/blocks/chapter.css create mode 100644 css/blocks/code.css create mode 100644 css/blocks/common.css create mode 100644 css/blocks/footer.css create mode 100644 css/blocks/guide-content.css create mode 100644 css/blocks/header.css create mode 100644 css/blocks/logo-list.css create mode 100644 css/blocks/prism.css create mode 100644 css/blocks/sidebar.css diff --git a/css/blocks/chapter.css b/css/blocks/chapter.css new file mode 100644 index 0000000..535e053 --- /dev/null +++ b/css/blocks/chapter.css @@ -0,0 +1,94 @@ +.chapters { + width: 100%; +} + +.chapter h2 { + padding: 2rem 1rem; + word-break: break-word; + background-color: #e5e5e5; +} + +.chapter h3[id]::before { + display: block; + height: 2rem; + margin-top: -2rem; + visibility: hidden; + content: ""; +} + +.chapter-part { + display: flex; + flex-direction: column; + + border-bottom: 1px solid #e5e5e5; +} + +.chapter-part-col { + padding: 2rem 1rem; +} + +.chapter-part-col figure { + margin: 0 1rem 0 0; +} + +.chapter-part-col p { + max-width: 32rem; +} + +.chapter-part-col + .chapter-part-col { + border-top: 1px solid #e5e5e5; +} + +.gray-bgcolor { + background-color: #fafafa; +} + +@media (min-width: 38em) { + .chapter h2 { + padding: 2rem 2rem 2.5rem; + } + + .chapter-part-col { + padding: 2rem; + } +} + +@media (min-width: 38em) { + .chapter h2 { + padding: 2rem 2rem 2.5rem; + } + + .chapter-part-col { + padding: 2rem; + } +} + +@media (min-width: 48em) { + .chapter h2 { + padding: 2rem 3rem 2.5rem; + } + + .chapter-part { + flex-direction: row; + } + + .chapter-part-col { + width: 50%; + padding: 3rem 1.5rem; + } + + .chapter-part-col--full-width { + width: 100%; + } + + .chapter-part-col + .chapter-part-col { + border-top: 0; + } +} + +@media (min-width: 75em) { + .chapters { + width: calc(100% - 230px); + } +} + diff --git a/css/blocks/code.css b/css/blocks/code.css new file mode 100644 index 0000000..7b3d709 --- /dev/null +++ b/css/blocks/code.css @@ -0,0 +1,31 @@ +code, +pre { + font-family: "Consolas", "Liberation Mono", "Menlo", "Courier", monospace; +} + +code { + padding: 2px 4px; + + font-size: 95%; + color: #d44950; + + background-color: #f7f7f9; + border-radius: 0.2rem; +} + +pre { + display: block; + margin: 0 0 1rem; + + line-height: 1.4; + white-space: pre-wrap; +} + +pre code { + padding: 0; + + color: inherit; + + background-color: transparent; + border: 0; +} diff --git a/css/blocks/common.css b/css/blocks/common.css new file mode 100644 index 0000000..4ac5aee --- /dev/null +++ b/css/blocks/common.css @@ -0,0 +1,92 @@ +*, +*::before, +*::after { + box-sizing: border-box; +} + +html { + font-size: 16px; + scroll-behavior: smooth; +} + +body { + margin: 0; + + font: 17px/1.6 "Helvetica", "Arial", sans-serif; + color: #5a5a5a; + + background-color: #ffffff; +} + +a:link, +a:visited { + color: #3f3ccb; + text-decoration: none; +} + +a:hover, +a:focus { + color: #302683; + text-decoration: underline; +} + +h1, +h2, +h3 { + margin: 0; + + font-weight: normal; + color: #424242; + letter-spacing: -0.025em; +} + +h2, +h3, +h4 { + line-height: 1.2; +} + +h1 { + font-size: 3rem; + line-height: 1.3; +} + +h2 { + font-size: 2.5rem; +} + +h3 { + font-size: 1.75rem; + scroll-margin-top: 20px; +} + +ul li { + margin-bottom: 0.25rem; +} + +.visually-hidden { + position: absolute; + + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + + border: 0; + + clip: rect(0, 0, 0, 0); + clip-path: inset(100%); +} + +@media (min-width: 38em) { + html { + font-size: 20px; + } +} + +@media (min-width: 38em) { + html { + font-size: 20px; + } +} diff --git a/css/blocks/footer.css b/css/blocks/footer.css new file mode 100644 index 0000000..debd653 --- /dev/null +++ b/css/blocks/footer.css @@ -0,0 +1,67 @@ +footer { + padding: 2rem; + + background-color: #2d2d44; +} + +.contacts { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.logo-full { + display: inline-block; + width: 161px; +} + +.social-icons { + display: flex; + justify-content: space-between; + align-items: center; + margin: 0.5rem 0 1rem 0; +} + +.social-icons, +.github { + font-size: 0; +} + +.icon { + min-width: 2rem; + min-height: 2rem; + + background-repeat: no-repeat; + background-position: center; + background-size: calc(100% - 5px); + opacity: 0.5; +} + +.icon:hover { + opacity: 1; +} + +.icon-vk { + background-image: url("http://github.com/img/icon-vkontakte.svg"); +} + +.icon-fb { + background-image: url("http://github.com/img/icon-facebook.svg"); +} + +.icon-tw { + background-image: url("http://github.com/img/icon-twitter.svg"); +} + +.icon-ig { + background-image: url("http://github.com/img/icon-instagram.svg"); +} + +.github-link { + display: inline-block; + width: 91px; + height: 16px; + + background-image: url("http://github.com/img/github.svg"); +} diff --git a/css/blocks/guide-content.css b/css/blocks/guide-content.css new file mode 100644 index 0000000..95478c2 --- /dev/null +++ b/css/blocks/guide-content.css @@ -0,0 +1,4 @@ +.guide-content { + display: flex; + flex-wrap: wrap; +} diff --git a/css/blocks/header.css b/css/blocks/header.css new file mode 100644 index 0000000..f3c21eb --- /dev/null +++ b/css/blocks/header.css @@ -0,0 +1,44 @@ +header { + padding: 1rem 1rem 6rem; + + text-align: center; + + background-color: #312785; + background-image: repeating-linear-gradient(150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px), repeating-linear-gradient(-150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px); + background-size: 82px 47px; +} + +header h1 { + margin: 0 0 0.25rem; + + color: #ffffff; +} + +header p { + margin-top: 0; + + font-size: 1.1rem; +} + +header a:link, +header a:visited { + color: #ffffff; +} + +.logo { + width: 300px; + height: 300px; +} + +@media (min-width: 38em) { + header { + padding-bottom: 4rem; + } +} + +@media (min-width: 38em) { + header { + padding-bottom: 4rem; + } +} + diff --git a/css/blocks/logo-list.css b/css/blocks/logo-list.css new file mode 100644 index 0000000..f2f4966 --- /dev/null +++ b/css/blocks/logo-list.css @@ -0,0 +1,19 @@ +.logo-list { + max-width: 550px; + margin: 50px auto; +} + +.logo-list ul { + display: flex; + flex-wrap: wrap; + justify-content: space-around; + margin: 0; + padding: 0; + + list-style: none; +} + +.logo-list li { + margin-right: 10px; + margin-left: 10px; +} diff --git a/css/blocks/prism.css b/css/blocks/prism.css new file mode 100644 index 0000000..40979f6 --- /dev/null +++ b/css/blocks/prism.css @@ -0,0 +1,49 @@ +/* override default prism theme */ +code[class*="language-"], +pre[class*="language-"] { + white-space: pre-wrap; +} + +pre[class*="language-"] { + margin: 0; + padding: 0; +} + +:not(pre) > code[class*="language-"], +pre[class*="language-"] { + background: initial; +} + +/* override default prism theme */ +code[class*="language-"], +pre[class*="language-"] { + white-space: pre-wrap; +} + +pre[class*="language-"] { + margin: 0; + padding: 0; +} + +:not(pre) > code[class*="language-"], +pre[class*="language-"] { + background: initial; +} + +pre.language-correct, +pre.language-incorrect { + padding: 5px 10px; +} + +pre.language-correct { + background: #deeede; +} + +pre.language-incorrect { + background: #f4d3d3; +} + +pre.language-correct .token.operator, +pre.language-incorrect .token.operator { + background: none; +} diff --git a/css/blocks/sidebar.css b/css/blocks/sidebar.css new file mode 100644 index 0000000..94cca20 --- /dev/null +++ b/css/blocks/sidebar.css @@ -0,0 +1,118 @@ +.sidebar { + display: flex; + flex-direction: column; + + width: 100%; +} + +.sidebar a { + display: block; + color: #5a5a5a; +} + +.sidebar a:hover { + color: #3f3ccb; +} + +.sidebar-col { + padding: 2rem 1rem; +} + +.sidebar-col + .sidebar-col { + border-top: 1px solid #e5e5e5; +} + +.sidebar-col > a { + font-size: 1.75rem; + line-height: 1.25; +} + +.sidebar-menu { + padding-left: 1rem; +} + +@media (min-width: 48em) { + .sidebar { + flex-direction: row; + flex-wrap: wrap; + + padding: 2rem 0; + } + + .sidebar-col { + width: 50%; + padding: 1rem 3rem; + } + + .sidebar-col + .sidebar-col { + border-top: 0; + } +} + +@media (min-width: 75em) { + .sidebar { + position: sticky; + top: 0; + bottom: 0; + + flex-direction: column; + flex-wrap: nowrap; + align-self: flex-start; + + width: 230px; + height: 100vh; + padding: 0 1rem; + + overflow-y: auto; + line-height: 1.25; + border-right: 1px solid #e5e5e5; + } + + .sidebar-col { + flex-shrink: 0; + + width: 100%; + padding: 0; + } + + .sidebar-col-first { + padding-top: 1.75rem; + } + + .sidebar-col-last { + padding-bottom: 1.75rem; + } + + .sidebar-col + .sidebar-col { + margin-top: 1.75em; + } + + .sidebar-col > a { + display: block; + + font-size: 0.8rem; + font-weight: bold; + } + + .sidebar-menu { + padding: 0; + margin: 0.5em 0 0; + + list-style: none; + + font-size: 0.7rem; + } + + .sidebar-menu li { + margin: 0; + + line-height: 1.45; + } + + .sidebar-menu a { + display: block; + + padding: 0.25em 0; + } +} + diff --git a/css/style.css b/css/style.css index acb48a7..fb866f3 100644 --- a/css/style.css +++ b/css/style.css @@ -1,493 +1,9 @@ -*, -*::before, -*::after { - box-sizing: border-box; -} - -html { - font-size: 16px; - scroll-behavior: smooth; -} - -body { - margin: 0; - - font: 17px/1.6 "Helvetica", "Arial", sans-serif; - color: #5a5a5a; - - background-color: #ffffff; -} - -a:link, -a:visited { - color: #3f3ccb; - text-decoration: none; -} - -a:hover, -a:focus { - color: #302683; - text-decoration: underline; -} - -h1, -h2, -h3 { - margin: 0; - - font-weight: normal; - color: #424242; - letter-spacing: -0.025em; -} - -h2, -h3, -h4 { - line-height: 1.2; -} - -h1 { - font-size: 3rem; - line-height: 1.3; -} - -h2 { - font-size: 2.5rem; -} - -h3 { - font-size: 1.75rem; - scroll-margin-top: 20px; -} - -code, -pre { - font-family: "Consolas", "Liberation Mono", "Menlo", "Courier", monospace; -} - -code { - padding: 2px 4px; - - font-size: 95%; - color: #d44950; - - background-color: #f7f7f9; - border-radius: 0.2rem; -} - -pre { - display: block; - margin: 0 0 1rem; - - line-height: 1.4; - white-space: pre-wrap; -} - -pre code { - padding: 0; - - color: inherit; - - background-color: transparent; - border: 0; -} - -ul li { - margin-bottom: 0.25rem; -} - -header { - padding: 1rem 1rem 6rem; - - text-align: center; - - background-color: #312785; - background-image: repeating-linear-gradient(150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px), repeating-linear-gradient(-150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px); - background-size: 82px 47px; -} - -header h1 { - margin: 0 0 0.25rem; - - color: #ffffff; -} - -header p { - margin-top: 0; - - font-size: 1.1rem; -} - -header a:link, -header a:visited { - color: #ffffff; -} - -.visually-hidden { - position: absolute; - - width: 1px; - height: 1px; - margin: -1px; - padding: 0; - overflow: hidden; - - border: 0; - - clip: rect(0, 0, 0, 0); - clip-path: inset(100%); -} - -.logo-list { - max-width: 550px; - margin: 50px auto; -} - -.logo-list ul { - display: flex; - flex-wrap: wrap; - justify-content: space-around; - margin: 0; - padding: 0; - - list-style: none; -} - -.logo-list li { - margin-right: 10px; - margin-left: 10px; -} - -.logo { - width: 300px; - height: 300px; -} - -.guide-content { - display: flex; - flex-wrap: wrap; -} - -.sidebar { - display: flex; - flex-direction: column; - - width: 100%; -} - -.sidebar a { - display: block; - color: #5a5a5a; -} - -.sidebar a:hover { - color: #3f3ccb; -} - -.sidebar-col { - padding: 2rem 1rem; -} - -.sidebar-col + .sidebar-col { - border-top: 1px solid #e5e5e5; -} - -.sidebar-col > a { - font-size: 1.75rem; - line-height: 1.25; -} - -.sidebar-menu { - padding-left: 1rem; -} - -.chapters { - width: 100%; -} - -.chapter h2 { - padding: 2rem 1rem; - word-break: break-word; - background-color: #e5e5e5; -} - -.chapter h3[id]::before { - display: block; - height: 2rem; - margin-top: -2rem; - visibility: hidden; - content: ""; -} - -.chapter-part { - display: flex; - flex-direction: column; - - border-bottom: 1px solid #e5e5e5; -} - -.chapter-part-col { - padding: 2rem 1rem; -} - -.chapter-part-col figure { - margin: 0 1rem 0 0; -} - -.chapter-part-col p { - max-width: 32rem; -} - -.chapter-part-col + .chapter-part-col { - border-top: 1px solid #e5e5e5; -} - -.gray-bgcolor { - background-color: #fafafa; -} - -footer { - padding: 2rem; - - background-color: #2d2d44; -} - -.contacts { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} - -.logo-full { - display: inline-block; - width: 161px; -} - -.social-icons { - display: flex; - justify-content: space-between; - align-items: center; - margin: 0.5rem 0 1rem 0; -} - -.social-icons, -.github { - font-size: 0; -} - -.icon { - min-width: 2rem; - min-height: 2rem; - - background-repeat: no-repeat; - background-position: center; - background-size: calc(100% - 5px); - opacity: 0.5; -} - -.icon:hover { - opacity: 1; -} - -.icon-vk { - background-image: url("http://github.com/img/icon-vkontakte.svg"); -} - -.icon-fb { - background-image: url("http://github.com/img/icon-facebook.svg"); -} - -.icon-tw { - background-image: url("http://github.com/img/icon-twitter.svg"); -} - -.icon-ig { - background-image: url("http://github.com/img/icon-instagram.svg"); -} - -.github-link { - display: inline-block; - width: 91px; - height: 16px; - - background-image: url("http://github.com/img/github.svg"); -} - -@media (min-width: 38em) { - header { - padding-bottom: 4rem; - } - - html { - font-size: 20px; - } - - .chapter h2 { - padding: 2rem 2rem 2.5rem; - } - - .chapter-part-col { - padding: 2rem; - } -} - -@media (min-width: 48em) { - .sidebar { - flex-direction: row; - flex-wrap: wrap; - - padding: 2rem 0; - } - - .sidebar-col { - width: 50%; - padding: 1rem 3rem; - } - - .sidebar-col + .sidebar-col { - border-top: 0; - } - - .chapter h2 { - padding: 2rem 3rem 2.5rem; - } - - .chapter-part { - flex-direction: row; - } - - .chapter-part-col { - width: 50%; - padding: 3rem 1.5rem; - } - - .chapter-part-col--full-width { - width: 100%; - } - - .chapter-part-col + .chapter-part-col { - border-top: 0; - } -} - -@media (min-width: 75em) { - .chapters { - width: calc(100% - 230px); - } - - .sidebar { - position: sticky; - top: 0; - bottom: 0; - - flex-direction: column; - flex-wrap: nowrap; - align-self: flex-start; - - width: 230px; - height: 100vh; - padding: 0 1rem; - - overflow-y: auto; - line-height: 1.25; - border-right: 1px solid #e5e5e5; - } - - .sidebar-col { - flex-shrink: 0; - - width: 100%; - padding: 0; - } - - .sidebar-col-first { - padding-top: 1.75rem; - } - - .sidebar-col-last { - padding-bottom: 1.75rem; - } - - .sidebar-col + .sidebar-col { - margin-top: 1.75em; - } - - .sidebar-col > a { - display: block; - - font-size: 0.8rem; - font-weight: bold; - } - - .sidebar-menu { - padding: 0; - margin: 0.5em 0 0; - - list-style: none; - - font-size: 0.7rem; - } - - .sidebar-menu li { - margin: 0; - - line-height: 1.45; - } - - .sidebar-menu a { - display: block; - - padding: 0.25em 0; - } -} - -/* override default prism theme */ -code[class*="language-"], -pre[class*="language-"] { - white-space: pre-wrap; -} - -pre[class*="language-"] { - margin: 0; - padding: 0; -} - -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background: initial; -} - -/* override default prism theme */ -code[class*="language-"], -pre[class*="language-"] { - white-space: pre-wrap; -} - -pre[class*="language-"] { - margin: 0; - padding: 0; -} - -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background: initial; -} - -pre.language-correct, -pre.language-incorrect { - padding: 5px 10px; -} - -pre.language-correct { - background: #deeede; -} - -pre.language-incorrect { - background: #f4d3d3; -} - -pre.language-correct .token.operator, -pre.language-incorrect .token.operator { - background: none; -} +@import "http://github.com/blocks/common.css"; +@import "http://github.com/blocks/code.css"; +@import "http://github.com/blocks/header.css"; +@import "http://github.com/blocks/logo-list.css"; +@import "http://github.com/blocks/guide-content.css"; +@import "http://github.com/blocks/sidebar.css"; +@import "http://github.com/blocks/chapter.css"; +@import "http://github.com/blocks/footer.css"; +@import "http://github.com/blocks/prism.css"; From bebe28b0b9d45ed7395693a075f64a822412ab94 Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:05:02 +0300 Subject: [PATCH 04/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D1=8B=20=D1=88?= =?UTF-8?q?=D1=80=D0=B8=D1=84=D1=82=D0=B0,=20=D0=BA=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D1=8B=D0=B5=20=D0=BD=D0=B8=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D1=81=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D1=8E=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/common.css | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/css/blocks/common.css b/css/blocks/common.css index 4ac5aee..3f520f6 100644 --- a/css/blocks/common.css +++ b/css/blocks/common.css @@ -5,7 +5,6 @@ } html { - font-size: 16px; scroll-behavior: smooth; } @@ -78,15 +77,3 @@ ul li { clip: rect(0, 0, 0, 0); clip-path: inset(100%); } - -@media (min-width: 38em) { - html { - font-size: 20px; - } -} - -@media (min-width: 38em) { - html { - font-size: 20px; - } -} From cf4aa51e72fa7ae997075bb1d15937d7c753df1d Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:05:55 +0300 Subject: [PATCH 05/23] =?UTF-8?q?=D0=94=D0=B5=D0=BA=D0=BE=D0=BC=D0=BF?= =?UTF-8?q?=D0=BE=D0=B7=D0=B8=D1=80=D1=83=D0=B5=D1=82=20=D1=81=D0=BE=D0=B1?= =?UTF-8?q?=D0=B8=D1=80=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20?= =?UTF-8?q?=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/common.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/blocks/common.css b/css/blocks/common.css index 3f520f6..3d4e584 100644 --- a/css/blocks/common.css +++ b/css/blocks/common.css @@ -10,10 +10,10 @@ html { body { margin: 0; - - font: 17px/1.6 "Helvetica", "Arial", sans-serif; + font-size: 16px; + line-height: 1.6; + font-family: "Helvetica", "Arial", sans-serif; color: #5a5a5a; - background-color: #ffffff; } From 498b6fe9110bde950341dd840df544b9704a89ef Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:06:43 +0300 Subject: [PATCH 06/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B1=D0=B5=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/common.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/css/blocks/common.css b/css/blocks/common.css index 3d4e584..cc0a891 100644 --- a/css/blocks/common.css +++ b/css/blocks/common.css @@ -33,7 +33,6 @@ h1, h2, h3 { margin: 0; - font-weight: normal; color: #424242; letter-spacing: -0.025em; @@ -71,9 +70,7 @@ ul li { margin: -1px; padding: 0; overflow: hidden; - border: 0; - clip: rect(0, 0, 0, 0); clip-path: inset(100%); } From e56b23e7c8c52612fcd94a461103dacb025216d0 Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:07:10 +0300 Subject: [PATCH 07/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D1=8B=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B2=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/code.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/css/blocks/code.css b/css/blocks/code.css index 7b3d709..662bc70 100644 --- a/css/blocks/code.css +++ b/css/blocks/code.css @@ -5,10 +5,8 @@ pre { code { padding: 2px 4px; - font-size: 95%; color: #d44950; - background-color: #f7f7f9; border-radius: 0.2rem; } @@ -16,16 +14,13 @@ code { pre { display: block; margin: 0 0 1rem; - line-height: 1.4; white-space: pre-wrap; } pre code { padding: 0; - color: inherit; - background-color: transparent; border: 0; } From 8bc07e602fc0e8666d5e374b999dfdd2bf74012d Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:08:59 +0300 Subject: [PATCH 08/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D1=8B=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B2=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/header.css | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/css/blocks/header.css b/css/blocks/header.css index f3c21eb..f7f16d3 100644 --- a/css/blocks/header.css +++ b/css/blocks/header.css @@ -1,8 +1,6 @@ header { padding: 1rem 1rem 6rem; - text-align: center; - background-color: #312785; background-image: repeating-linear-gradient(150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px), repeating-linear-gradient(-150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px); background-size: 82px 47px; @@ -10,13 +8,11 @@ header { header h1 { margin: 0 0 0.25rem; - color: #ffffff; } header p { margin-top: 0; - font-size: 1.1rem; } @@ -35,10 +31,3 @@ header a:visited { padding-bottom: 4rem; } } - -@media (min-width: 38em) { - header { - padding-bottom: 4rem; - } -} - From 0fa61e70ff11380f83cc6362819f0c9c366a1e73 Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:09:12 +0300 Subject: [PATCH 09/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D1=8B=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B2=20logo-list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/logo-list.css | 1 - 1 file changed, 1 deletion(-) diff --git a/css/blocks/logo-list.css b/css/blocks/logo-list.css index f2f4966..6c40a66 100644 --- a/css/blocks/logo-list.css +++ b/css/blocks/logo-list.css @@ -9,7 +9,6 @@ justify-content: space-around; margin: 0; padding: 0; - list-style: none; } From 82fedcf106cffbc0059f892944daf9e2876e7ce0 Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:09:57 +0300 Subject: [PATCH 10/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D1=8B=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B2=20sidebar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/sidebar.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/css/blocks/sidebar.css b/css/blocks/sidebar.css index 94cca20..d9b8d5d 100644 --- a/css/blocks/sidebar.css +++ b/css/blocks/sidebar.css @@ -1,7 +1,6 @@ .sidebar { display: flex; flex-direction: column; - width: 100%; } @@ -35,7 +34,6 @@ .sidebar { flex-direction: row; flex-wrap: wrap; - padding: 2rem 0; } @@ -54,15 +52,12 @@ position: sticky; top: 0; bottom: 0; - flex-direction: column; flex-wrap: nowrap; align-self: flex-start; - width: 230px; height: 100vh; padding: 0 1rem; - overflow-y: auto; line-height: 1.25; border-right: 1px solid #e5e5e5; @@ -70,7 +65,6 @@ .sidebar-col { flex-shrink: 0; - width: 100%; padding: 0; } @@ -97,21 +91,17 @@ .sidebar-menu { padding: 0; margin: 0.5em 0 0; - list-style: none; - font-size: 0.7rem; } .sidebar-menu li { margin: 0; - line-height: 1.45; } .sidebar-menu a { display: block; - padding: 0.25em 0; } } From 72b5e9a30d197f21dd94185ce6ee6ae466dbeaef Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:10:33 +0300 Subject: [PATCH 11/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D1=8B=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B2=20chapter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/chapter.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/css/blocks/chapter.css b/css/blocks/chapter.css index 535e053..92cd3e1 100644 --- a/css/blocks/chapter.css +++ b/css/blocks/chapter.css @@ -19,7 +19,6 @@ .chapter-part { display: flex; flex-direction: column; - border-bottom: 1px solid #e5e5e5; } @@ -53,15 +52,6 @@ } } -@media (min-width: 38em) { - .chapter h2 { - padding: 2rem 2rem 2.5rem; - } - - .chapter-part-col { - padding: 2rem; - } -} @media (min-width: 48em) { .chapter h2 { From 4daaec58bf1eaa3b38c15b79a81e954e4703267f Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 08:10:55 +0300 Subject: [PATCH 12/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D1=8B=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B2=20footer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/footer.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/css/blocks/footer.css b/css/blocks/footer.css index debd653..338eb6c 100644 --- a/css/blocks/footer.css +++ b/css/blocks/footer.css @@ -1,6 +1,5 @@ footer { padding: 2rem; - background-color: #2d2d44; } @@ -31,7 +30,6 @@ footer { .icon { min-width: 2rem; min-height: 2rem; - background-repeat: no-repeat; background-position: center; background-size: calc(100% - 5px); @@ -62,6 +60,5 @@ footer { display: inline-block; width: 91px; height: 16px; - background-image: url("http://github.com/img/github.svg"); } From 892bddc3f67a606edf4ac128e1cda806222171f5 Mon Sep 17 00:00:00 2001 From: Shabalin Nikolai Date: Wed, 27 Oct 2021 16:45:36 +0300 Subject: [PATCH 13/23] =?UTF-8?q?=D0=A7=D0=B8=D0=BD=D0=B8=D1=82=20=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/blocks/chapter.css | 84 ------ css/blocks/code.css | 26 -- css/blocks/common.css | 76 ------ css/blocks/footer.css | 64 ----- css/blocks/guide-content.css | 4 - css/blocks/header.css | 33 --- css/blocks/logo-list.css | 18 -- css/blocks/prism.css | 49 ---- css/blocks/sidebar.css | 108 -------- css/style.css | 495 ++++++++++++++++++++++++++++++++++- 10 files changed, 486 insertions(+), 471 deletions(-) delete mode 100644 css/blocks/chapter.css delete mode 100644 css/blocks/code.css delete mode 100644 css/blocks/common.css delete mode 100644 css/blocks/footer.css delete mode 100644 css/blocks/guide-content.css delete mode 100644 css/blocks/header.css delete mode 100644 css/blocks/logo-list.css delete mode 100644 css/blocks/prism.css delete mode 100644 css/blocks/sidebar.css diff --git a/css/blocks/chapter.css b/css/blocks/chapter.css deleted file mode 100644 index 92cd3e1..0000000 --- a/css/blocks/chapter.css +++ /dev/null @@ -1,84 +0,0 @@ -.chapters { - width: 100%; -} - -.chapter h2 { - padding: 2rem 1rem; - word-break: break-word; - background-color: #e5e5e5; -} - -.chapter h3[id]::before { - display: block; - height: 2rem; - margin-top: -2rem; - visibility: hidden; - content: ""; -} - -.chapter-part { - display: flex; - flex-direction: column; - border-bottom: 1px solid #e5e5e5; -} - -.chapter-part-col { - padding: 2rem 1rem; -} - -.chapter-part-col figure { - margin: 0 1rem 0 0; -} - -.chapter-part-col p { - max-width: 32rem; -} - -.chapter-part-col + .chapter-part-col { - border-top: 1px solid #e5e5e5; -} - -.gray-bgcolor { - background-color: #fafafa; -} - -@media (min-width: 38em) { - .chapter h2 { - padding: 2rem 2rem 2.5rem; - } - - .chapter-part-col { - padding: 2rem; - } -} - - -@media (min-width: 48em) { - .chapter h2 { - padding: 2rem 3rem 2.5rem; - } - - .chapter-part { - flex-direction: row; - } - - .chapter-part-col { - width: 50%; - padding: 3rem 1.5rem; - } - - .chapter-part-col--full-width { - width: 100%; - } - - .chapter-part-col + .chapter-part-col { - border-top: 0; - } -} - -@media (min-width: 75em) { - .chapters { - width: calc(100% - 230px); - } -} - diff --git a/css/blocks/code.css b/css/blocks/code.css deleted file mode 100644 index 662bc70..0000000 --- a/css/blocks/code.css +++ /dev/null @@ -1,26 +0,0 @@ -code, -pre { - font-family: "Consolas", "Liberation Mono", "Menlo", "Courier", monospace; -} - -code { - padding: 2px 4px; - font-size: 95%; - color: #d44950; - background-color: #f7f7f9; - border-radius: 0.2rem; -} - -pre { - display: block; - margin: 0 0 1rem; - line-height: 1.4; - white-space: pre-wrap; -} - -pre code { - padding: 0; - color: inherit; - background-color: transparent; - border: 0; -} diff --git a/css/blocks/common.css b/css/blocks/common.css deleted file mode 100644 index cc0a891..0000000 --- a/css/blocks/common.css +++ /dev/null @@ -1,76 +0,0 @@ -*, -*::before, -*::after { - box-sizing: border-box; -} - -html { - scroll-behavior: smooth; -} - -body { - margin: 0; - font-size: 16px; - line-height: 1.6; - font-family: "Helvetica", "Arial", sans-serif; - color: #5a5a5a; - background-color: #ffffff; -} - -a:link, -a:visited { - color: #3f3ccb; - text-decoration: none; -} - -a:hover, -a:focus { - color: #302683; - text-decoration: underline; -} - -h1, -h2, -h3 { - margin: 0; - font-weight: normal; - color: #424242; - letter-spacing: -0.025em; -} - -h2, -h3, -h4 { - line-height: 1.2; -} - -h1 { - font-size: 3rem; - line-height: 1.3; -} - -h2 { - font-size: 2.5rem; -} - -h3 { - font-size: 1.75rem; - scroll-margin-top: 20px; -} - -ul li { - margin-bottom: 0.25rem; -} - -.visually-hidden { - position: absolute; - - width: 1px; - height: 1px; - margin: -1px; - padding: 0; - overflow: hidden; - border: 0; - clip: rect(0, 0, 0, 0); - clip-path: inset(100%); -} diff --git a/css/blocks/footer.css b/css/blocks/footer.css deleted file mode 100644 index 338eb6c..0000000 --- a/css/blocks/footer.css +++ /dev/null @@ -1,64 +0,0 @@ -footer { - padding: 2rem; - background-color: #2d2d44; -} - -.contacts { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} - -.logo-full { - display: inline-block; - width: 161px; -} - -.social-icons { - display: flex; - justify-content: space-between; - align-items: center; - margin: 0.5rem 0 1rem 0; -} - -.social-icons, -.github { - font-size: 0; -} - -.icon { - min-width: 2rem; - min-height: 2rem; - background-repeat: no-repeat; - background-position: center; - background-size: calc(100% - 5px); - opacity: 0.5; -} - -.icon:hover { - opacity: 1; -} - -.icon-vk { - background-image: url("http://github.com/img/icon-vkontakte.svg"); -} - -.icon-fb { - background-image: url("http://github.com/img/icon-facebook.svg"); -} - -.icon-tw { - background-image: url("http://github.com/img/icon-twitter.svg"); -} - -.icon-ig { - background-image: url("http://github.com/img/icon-instagram.svg"); -} - -.github-link { - display: inline-block; - width: 91px; - height: 16px; - background-image: url("http://github.com/img/github.svg"); -} diff --git a/css/blocks/guide-content.css b/css/blocks/guide-content.css deleted file mode 100644 index 95478c2..0000000 --- a/css/blocks/guide-content.css +++ /dev/null @@ -1,4 +0,0 @@ -.guide-content { - display: flex; - flex-wrap: wrap; -} diff --git a/css/blocks/header.css b/css/blocks/header.css deleted file mode 100644 index f7f16d3..0000000 --- a/css/blocks/header.css +++ /dev/null @@ -1,33 +0,0 @@ -header { - padding: 1rem 1rem 6rem; - text-align: center; - background-color: #312785; - background-image: repeating-linear-gradient(150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px), repeating-linear-gradient(-150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px); - background-size: 82px 47px; -} - -header h1 { - margin: 0 0 0.25rem; - color: #ffffff; -} - -header p { - margin-top: 0; - font-size: 1.1rem; -} - -header a:link, -header a:visited { - color: #ffffff; -} - -.logo { - width: 300px; - height: 300px; -} - -@media (min-width: 38em) { - header { - padding-bottom: 4rem; - } -} diff --git a/css/blocks/logo-list.css b/css/blocks/logo-list.css deleted file mode 100644 index 6c40a66..0000000 --- a/css/blocks/logo-list.css +++ /dev/null @@ -1,18 +0,0 @@ -.logo-list { - max-width: 550px; - margin: 50px auto; -} - -.logo-list ul { - display: flex; - flex-wrap: wrap; - justify-content: space-around; - margin: 0; - padding: 0; - list-style: none; -} - -.logo-list li { - margin-right: 10px; - margin-left: 10px; -} diff --git a/css/blocks/prism.css b/css/blocks/prism.css deleted file mode 100644 index 40979f6..0000000 --- a/css/blocks/prism.css +++ /dev/null @@ -1,49 +0,0 @@ -/* override default prism theme */ -code[class*="language-"], -pre[class*="language-"] { - white-space: pre-wrap; -} - -pre[class*="language-"] { - margin: 0; - padding: 0; -} - -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background: initial; -} - -/* override default prism theme */ -code[class*="language-"], -pre[class*="language-"] { - white-space: pre-wrap; -} - -pre[class*="language-"] { - margin: 0; - padding: 0; -} - -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background: initial; -} - -pre.language-correct, -pre.language-incorrect { - padding: 5px 10px; -} - -pre.language-correct { - background: #deeede; -} - -pre.language-incorrect { - background: #f4d3d3; -} - -pre.language-correct .token.operator, -pre.language-incorrect .token.operator { - background: none; -} diff --git a/css/blocks/sidebar.css b/css/blocks/sidebar.css deleted file mode 100644 index d9b8d5d..0000000 --- a/css/blocks/sidebar.css +++ /dev/null @@ -1,108 +0,0 @@ -.sidebar { - display: flex; - flex-direction: column; - width: 100%; -} - -.sidebar a { - display: block; - color: #5a5a5a; -} - -.sidebar a:hover { - color: #3f3ccb; -} - -.sidebar-col { - padding: 2rem 1rem; -} - -.sidebar-col + .sidebar-col { - border-top: 1px solid #e5e5e5; -} - -.sidebar-col > a { - font-size: 1.75rem; - line-height: 1.25; -} - -.sidebar-menu { - padding-left: 1rem; -} - -@media (min-width: 48em) { - .sidebar { - flex-direction: row; - flex-wrap: wrap; - padding: 2rem 0; - } - - .sidebar-col { - width: 50%; - padding: 1rem 3rem; - } - - .sidebar-col + .sidebar-col { - border-top: 0; - } -} - -@media (min-width: 75em) { - .sidebar { - position: sticky; - top: 0; - bottom: 0; - flex-direction: column; - flex-wrap: nowrap; - align-self: flex-start; - width: 230px; - height: 100vh; - padding: 0 1rem; - overflow-y: auto; - line-height: 1.25; - border-right: 1px solid #e5e5e5; - } - - .sidebar-col { - flex-shrink: 0; - width: 100%; - padding: 0; - } - - .sidebar-col-first { - padding-top: 1.75rem; - } - - .sidebar-col-last { - padding-bottom: 1.75rem; - } - - .sidebar-col + .sidebar-col { - margin-top: 1.75em; - } - - .sidebar-col > a { - display: block; - - font-size: 0.8rem; - font-weight: bold; - } - - .sidebar-menu { - padding: 0; - margin: 0.5em 0 0; - list-style: none; - font-size: 0.7rem; - } - - .sidebar-menu li { - margin: 0; - line-height: 1.45; - } - - .sidebar-menu a { - display: block; - padding: 0.25em 0; - } -} - diff --git a/css/style.css b/css/style.css index fb866f3..df96900 100644 --- a/css/style.css +++ b/css/style.css @@ -1,9 +1,486 @@ -@import "http://github.com/blocks/common.css"; -@import "http://github.com/blocks/code.css"; -@import "http://github.com/blocks/header.css"; -@import "http://github.com/blocks/logo-list.css"; -@import "http://github.com/blocks/guide-content.css"; -@import "http://github.com/blocks/sidebar.css"; -@import "http://github.com/blocks/chapter.css"; -@import "http://github.com/blocks/footer.css"; -@import "http://github.com/blocks/prism.css"; +/* Common */ + +*, +*::before, +*::after { + box-sizing: border-box; +} + +html { + scroll-behavior: smooth; +} + +body { + margin: 0; + font-size: 16px; + line-height: 1.6; + font-family: "Helvetica", "Arial", sans-serif; + color: #5a5a5a; + background-color: #ffffff; +} + +a:link, +a:visited { + color: #3f3ccb; + text-decoration: none; +} + +a:hover, +a:focus { + color: #302683; + text-decoration: underline; +} + +h1, +h2, +h3 { + margin: 0; + font-weight: normal; + color: #424242; + letter-spacing: -0.025em; +} + +h2, +h3, +h4 { + line-height: 1.2; +} + +h1 { + font-size: 3rem; + line-height: 1.3; +} + +h2 { + font-size: 2.5rem; +} + +h3 { + font-size: 1.75rem; + scroll-margin-top: 20px; +} + +ul li { + margin-bottom: 0.25rem; +} + +.visually-hidden { + position: absolute; + + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + border: 0; + clip: rect(0, 0, 0, 0); + clip-path: inset(100%); +} + +/* Code */ + +code, +pre { + font-family: "Consolas", "Liberation Mono", "Menlo", "Courier", monospace; +} + +code { + padding: 2px 4px; + font-size: 95%; + color: #d44950; + background-color: #f7f7f9; + border-radius: 0.2rem; +} + +pre { + display: block; + margin: 0 0 1rem; + line-height: 1.4; + white-space: pre-wrap; +} + +pre code { + padding: 0; + color: inherit; + background-color: transparent; + border: 0; +} + +/* Header */ + +header { + padding: 1rem 1rem 6rem; + text-align: center; + background-color: #312785; + background-image: repeating-linear-gradient(150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px), repeating-linear-gradient(-150deg, rgba(255, 255, 255, 0.06), rgba(255, 255, 255, 0.06) 1px, transparent 0, transparent 41px); + background-size: 82px 47px; +} + +header h1 { + margin: 0 0 0.25rem; + color: #ffffff; +} + +header p { + margin-top: 0; + font-size: 1.1rem; +} + +header a:link, +header a:visited { + color: #ffffff; +} + +.logo { + width: 300px; + height: 300px; +} + +@media (min-width: 38em) { + header { + padding-bottom: 4rem; + } +} + +/* Logo list */ + +.logo-list { + max-width: 550px; + margin: 50px auto; +} + +.logo-list ul { + display: flex; + flex-wrap: wrap; + justify-content: space-around; + margin: 0; + padding: 0; + list-style: none; +} + +.logo-list li { + margin-right: 10px; + margin-left: 10px; +} + +/* Gudie content */ + +.guide-content { + display: flex; + flex-wrap: wrap; +} + +/* Sidebar */ + +.sidebar { + display: flex; + flex-direction: column; + width: 100%; +} + +.sidebar a { + display: block; + color: #5a5a5a; +} + +.sidebar a:hover { + color: #3f3ccb; +} + +.sidebar-col { + padding: 2rem 1rem; +} + +.sidebar-col + .sidebar-col { + border-top: 1px solid #e5e5e5; +} + +.sidebar-col > a { + font-size: 1.75rem; + line-height: 1.25; +} + +.sidebar-menu { + padding-left: 1rem; +} + +@media (min-width: 48em) { + .sidebar { + flex-direction: row; + flex-wrap: wrap; + padding: 2rem 0; + } + + .sidebar-col { + width: 50%; + padding: 1rem 3rem; + } + + .sidebar-col + .sidebar-col { + border-top: 0; + } +} + +@media (min-width: 75em) { + .sidebar { + position: sticky; + top: 0; + bottom: 0; + flex-direction: column; + flex-wrap: nowrap; + align-self: flex-start; + width: 230px; + height: 100vh; + padding: 0 1rem; + overflow-y: auto; + line-height: 1.25; + border-right: 1px solid #e5e5e5; + } + + .sidebar-col { + flex-shrink: 0; + width: 100%; + padding: 0; + } + + .sidebar-col-first { + padding-top: 1.75rem; + } + + .sidebar-col-last { + padding-bottom: 1.75rem; + } + + .sidebar-col + .sidebar-col { + margin-top: 1.75em; + } + + .sidebar-col > a { + display: block; + + font-size: 0.8rem; + font-weight: bold; + } + + .sidebar-menu { + padding: 0; + margin: 0.5em 0 0; + list-style: none; + font-size: 0.7rem; + } + + .sidebar-menu li { + margin: 0; + line-height: 1.45; + } + + .sidebar-menu a { + display: block; + padding: 0.25em 0; + } +} + +/* Chapter */ + +.chapters { + width: 100%; +} + +.chapter h2 { + padding: 2rem 1rem; + word-break: break-word; + background-color: #e5e5e5; +} + +.chapter h3[id]::before { + display: block; + height: 2rem; + margin-top: -2rem; + visibility: hidden; + content: ""; +} + +.chapter-part { + display: flex; + flex-direction: column; + border-bottom: 1px solid #e5e5e5; +} + +.chapter-part-col { + padding: 2rem 1rem; +} + +.chapter-part-col figure { + margin: 0 1rem 0 0; +} + +.chapter-part-col p { + max-width: 32rem; +} + +.chapter-part-col + .chapter-part-col { + border-top: 1px solid #e5e5e5; +} + +.gray-bgcolor { + background-color: #fafafa; +} + +@media (min-width: 38em) { + .chapter h2 { + padding: 2rem 2rem 2.5rem; + } + + .chapter-part-col { + padding: 2rem; + } +} + + +@media (min-width: 48em) { + .chapter h2 { + padding: 2rem 3rem 2.5rem; + } + + .chapter-part { + flex-direction: row; + } + + .chapter-part-col { + width: 50%; + padding: 3rem 1.5rem; + } + + .chapter-part-col--full-width { + width: 100%; + } + + .chapter-part-col + .chapter-part-col { + border-top: 0; + } +} + +@media (min-width: 75em) { + .chapters { + width: calc(100% - 230px); + } +} + +/* Footer */ + +footer { + padding: 2rem; + background-color: #2d2d44; +} + +.contacts { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.logo-full { + display: inline-block; + width: 161px; +} + +.social-icons { + display: flex; + justify-content: space-between; + align-items: center; + margin: 0.5rem 0 1rem 0; +} + +.social-icons, +.github { + font-size: 0; +} + +.icon { + min-width: 2rem; + min-height: 2rem; + background-repeat: no-repeat; + background-position: center; + background-size: calc(100% - 5px); + opacity: 0.5; +} + +.icon:hover { + opacity: 1; +} + +.icon-vk { + background-image: url("http://github.com/img/icon-vkontakte.svg"); +} + +.icon-fb { + background-image: url("http://github.com/img/icon-facebook.svg"); +} + +.icon-tw { + background-image: url("http://github.com/img/icon-twitter.svg"); +} + +.icon-ig { + background-image: url("http://github.com/img/icon-instagram.svg"); +} + +.github-link { + display: inline-block; + width: 91px; + height: 16px; + background-image: url("http://github.com/img/github.svg"); +} + +/* Prism */ + +/* override default prism theme */ +code[class*="language-"], +pre[class*="language-"] { + white-space: pre-wrap; +} + +pre[class*="language-"] { + margin: 0; + padding: 0; +} + +:not(pre) > code[class*="language-"], +pre[class*="language-"] { + background: initial; +} + +/* override default prism theme */ +code[class*="language-"], +pre[class*="language-"] { + white-space: pre-wrap; +} + +pre[class*="language-"] { + margin: 0; + padding: 0; +} + +:not(pre) > code[class*="language-"], +pre[class*="language-"] { + background: initial; +} + +pre.language-correct, +pre.language-incorrect { + padding: 5px 10px; +} + +pre.language-correct { + background: #deeede; +} + +pre.language-incorrect { + background: #f4d3d3; +} + +pre.language-correct .token.operator, +pre.language-incorrect .token.operator { + background: none; +} From 066499ff9568c3e95b8c208351d9276bb58a613a Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Wed, 27 Oct 2021 18:03:48 +0300 Subject: [PATCH 14/23] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=BB=D0=BE=D0=B3=D0=BE=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20JS=20(#53)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Обновляет лого для JS * Удаляет лишние атрибуты * Делает три логотипа: HTML, CSS, JS * Сопоставит размеры JS-лого с остальными --- css/style.css | 7 +++++-- img/icon-css.svg | 1 + img/icon-html.svg | 1 + img/icon-javascript.svg | 1 + img/logo-html.svg | 1 - img/logo-js.svg | 2 +- index.html | 8 ++++++-- 7 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 img/icon-css.svg create mode 100644 img/icon-html.svg create mode 100644 img/icon-javascript.svg delete mode 100644 img/logo-html.svg diff --git a/css/style.css b/css/style.css index df96900..3bd53e6 100644 --- a/css/style.css +++ b/css/style.css @@ -136,6 +136,10 @@ header a:visited { height: 300px; } +.logo-list-js { + margin: 11px 23px 0; +} + @media (min-width: 38em) { header { padding-bottom: 4rem; @@ -145,14 +149,13 @@ header a:visited { /* Logo list */ .logo-list { - max-width: 550px; margin: 50px auto; } .logo-list ul { display: flex; flex-wrap: wrap; - justify-content: space-around; + justify-content: center; margin: 0; padding: 0; list-style: none; diff --git a/img/icon-css.svg b/img/icon-css.svg new file mode 100644 index 0000000..3d8959a --- /dev/null +++ b/img/icon-css.svg @@ -0,0 +1 @@ +file_type_css \ No newline at end of file diff --git a/img/icon-html.svg b/img/icon-html.svg new file mode 100644 index 0000000..a0152d8 --- /dev/null +++ b/img/icon-html.svg @@ -0,0 +1 @@ +file_type_html \ No newline at end of file diff --git a/img/icon-javascript.svg b/img/icon-javascript.svg new file mode 100644 index 0000000..92316ce --- /dev/null +++ b/img/icon-javascript.svg @@ -0,0 +1 @@ + diff --git a/img/logo-html.svg b/img/logo-html.svg deleted file mode 100644 index 101e1ff..0000000 --- a/img/logo-html.svg +++ /dev/null @@ -1 +0,0 @@ -HTML5 Logo diff --git a/img/logo-js.svg b/img/logo-js.svg index d609063..3895f98 100644 --- a/img/logo-js.svg +++ b/img/logo-js.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/index.html b/index.html index efd2507..5df2a0b 100644 --- a/index.html +++ b/index.html @@ -41,12 +41,16 @@ From 343afcc8ebff142508942d6d971a91391f4fe4ba Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Wed, 27 Oct 2021 18:04:13 +0300 Subject: [PATCH 15/23] =?UTF-8?q?*=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20EditorConfig=20=D0=B2=20README.md=20(#56)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Приводит список конфигов к единому виду --- Readme.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Readme.md b/Readme.md index 8d23780..871bf7a 100644 --- a/Readme.md +++ b/Readme.md @@ -1,5 +1,6 @@ -# Стиль кода Академии HTML -Стиль кода можно [посмотреть тут](https://codeguide.academy/). +# Стиль кода .html academy + +Это исходники, публичная версия на сайте [codeguide.academy](https://codeguide.academy/). ## Благодарности @@ -10,12 +11,11 @@ ## Лицензия -Лицензия MIT, смотрите файл `License.md`. - -## Конфигурации линтеров - -ESLint — https://github.com/htmlacademy/eslint-config-htmlacademy +[MIT](./License.md). -Stylelint — https://github.com/htmlacademy/stylelint-config-htmlacademy +## Правила линтеров -linthtml — https://github.com/htmlacademy/linthtml-config-htmlacademy +* [EditorConfig](.editorconfig) +* [ESLint](https://github.com/htmlacademy/eslint-config-htmlacademy) +* [Stylelint](https://github.com/htmlacademy/stylelint-config-htmlacademy) +* [HTMLHint](https://github.com/htmlacademy/htmlhint-config-htmlacademy) From bfd3876aef6f63d115a3acc8945e1bdc3085e817 Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Tue, 9 Nov 2021 15:34:17 +0300 Subject: [PATCH 16/23] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=BF=D1=80=D0=BE=20=D0=B5=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B8=D1=86=D1=83=20=D0=B8=D0=B7=D0=BC=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BA=D0=B0=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=BC=D0=BD=D1=8B=D1=85=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82?= =?UTF-8?q?=D0=B2=D0=B0=D1=85=20(#66)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html-css.html | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/html-css.html b/html-css.html index eff6a65..cb8db70 100644 --- a/html-css.html +++ b/html-css.html @@ -870,22 +870,35 @@

    Повторяющиеся свойства

    Единицы измерения

    -

    Единицы измерения не указаны там, где в них нет необходимости.

    +
      +
    • Единицы измерения не указаны там, где в них нет необходимости.
      • +
    • В кастомных свойствах нужно указывать единицу измерения.
      • + 
    /* Хорошо */
+:root {
+  --size: 0px;
+}
+
 .element {
   border: 0;
   box-shadow: 0 1px 2px #cccccc, inset 0 1px 0 #ffffff;
   margin-top: 0;
+  width: calc(100% - var(--size));
 }
 
 /* Плохо */
+:root {
+  --size: 0;
+}
+
 .element {
   border: 0px;
   box-shadow: 0px 1px 2px #cccccc, inset 0px 1px 0 #ffffff;
   margin-top: 0px;
+  width: calc(100% - var(--size));
 }
    From ad1ae7ce150a5bbaf5c8eddfb35d426591f7a096 Mon Sep 17 00:00:00 2001 From: Nikolai Shabalin Date: Tue, 28 Dec 2021 17:20:44 +0300 Subject: [PATCH 17/23] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=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 18/23] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=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 19/23] =?UTF-8?q?=D0=A7=D0=B8=D0=BD=D0=B8=D1=82=20target?= =?UTF-8?q?=3D"=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 20/23] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D1=82=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=86=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=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 21/23] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=90=D0=BA=D0=B0=D0=B4=D0=B5=D0=BC=D0=B8=D0=B8?= =?UTF-8?q?=20(#68)?= 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 22/23] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D1=82=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D1=83?= =?UTF-8?q?=20=D0=BD=D0=B0=20Primer=20Guidelines=20=D0=BE=D1=82=20GitHub?= =?UTF-8?q?=20(#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 23/23] =?UTF-8?q?=D0=A3=D1=82=D0=BE=D1=87=D0=BD=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=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>