Skip to content

Commit

Permalink
Merge pull request #13 from Ayronhayd/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@keksobot
keksobot authored Jan 20, 2024
2 parents 1e171d8 + 42345de commit 3e1117a
Show file tree
Hide file tree
Showing 27 changed files with 252 additions and 56 deletions.
27 changes: 15 additions & 12 deletions source/404.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<!DOCTYPE html>
<html class="page" lang="ru">
<head>
<meta charset="UTF-8">
<title>404</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" href="styles/styles.css">
<script src="scripts/index.js" defer></script>
</head>
<body class="page__body">
<h1>404</h1>
<p>Страница не найдена. <a href="/">Перейти на главную</a>.</p>
</body>
<html lang="ru">

<head>
<meta charset="UTF-8">
<title>404</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" href="styles/styles.css">
</head>

<body>
<h1>404</h1>
<p>Страница не найдена. <a href="/">Перейти на главную</a>.</p>
<script src="scripts/index.js" defer></script>
</body>

</html>
24 changes: 12 additions & 12 deletions source/catalog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<link rel="icon" href="favicons/32.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="favicons/180.png">
<link rel="manifest" href="manifest.webmanifest">
<link rel="preload" href="/source/fonts/lato/Lato-Regular.woff2" as="font">
<link rel="preload" href="/source/fonts/oswald/oswaldregular.woff2" as="font">
<link rel="preload" href="/source/fonts/lato/Lato-Regular.woff2" as="font" crossorigin="anonymous">
<link rel="preload" href="/source/fonts/oswald/oswaldregular.woff2" as="font" crossorigin="anonymous">
</head>

<body>
Expand Down Expand Up @@ -42,8 +42,8 @@
<a class="site-list__link" href="index.html">главная</a>
</li>
<li class="site-list__item">
<a class="site-list__link site-list__link--active" href="#" aria-current="page"
tabindex="-1">каталог продукции</a>
<a class="site-list__link site-list__link--active" href="#" aria-current="page" tabindex="-1">каталог
продукции</a>
</li>
<li class="site-list__item">
<a class="site-list__link" href="form.html">подбор программы</a>
Expand All @@ -69,7 +69,7 @@ <h2 class="visually-hidden">Список продукции.</h2>
<picture>
<source type="image/webp" width="161" height="172" media="(min-width: 768px)"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
<source type="image/webp" width="68" height="86"
<source type="image/webp" width="68" height="86"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">

<source type="image/png" width="161" height="172" media="(min-width: 768px)"
Expand Down Expand Up @@ -104,7 +104,7 @@ <h3 class="card__heading">Cat Energy PRO 1000&nbsp;г</h3>
<picture>
<source type="image/webp" width="168" height="206" media="(min-width: 768px)"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
<source type="image/webp" width="84" height="100"
<source type="image/webp" width="84" height="100"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">

<source type="image/png" width="168" height="206" media="(min-width: 768px)"
Expand All @@ -131,7 +131,7 @@ <h3 class="card__heading">Cat Energy PRO 1000&nbsp;г</h3>
<picture>
<source type="image/webp" width="161" height="172" media="(min-width: 768px)"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
<source type="image/webp" width="68" height="86"
<source type="image/webp" width="68" height="86"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">

<source type="image/png" width="161" height="172" media="(min-width: 768px)"
Expand Down Expand Up @@ -159,7 +159,7 @@ <h3 class="card__heading">Cat Energy PRO 500&nbsp;г</h3>
<picture>
<source type="image/webp" width="168" height="206" media="(min-width: 768px)"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
<source type="image/webp" width="84" height="100"
<source type="image/webp" width="84" height="100"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">

<source type="image/png" width="168" height="206" media="(min-width: 768px)"
Expand Down Expand Up @@ -187,7 +187,7 @@ <h3 class="card__heading">Cat Energy PRO 1000&nbsp;г</h3>
<picture>
<source type="image/webp" width="161" height="172" media="(min-width: 768px)"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
<source type="image/webp" width="68" height="86"
<source type="image/webp" width="68" height="86"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">

<source type="image/png" width="161" height="172" media="(min-width: 768px)"
Expand All @@ -214,9 +214,9 @@ <h3 class="card__heading">Cat Energy SLIM 500&nbsp;г</h3>
<div class="card__container-image">
<picture>
<source type="image/webp" width="168" height="206" media="(min-width: 768px)"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
<source type="image/webp" width="84" height="100"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">

<source type="image/png" width="168" height="206" media="(min-width: 768px)"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
Expand All @@ -243,7 +243,7 @@ <h3 class="card__heading">Cat Energy SLIM 1000&nbsp;г</h3>
<picture>
<source type="image/webp" width="161" height="172" media="(min-width: 768px)"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">
<source type="image/webp" width="68" height="86"
<source type="image/webp" width="68" height="86"
srcset="images/catalog/[email protected] 1x, images/catalog/[email protected] 2x">

<source type="image/png" width="161" height="172" media="(min-width: 768px)"
Expand Down
10 changes: 5 additions & 5 deletions source/form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<link rel="icon" href="favicons/32.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="favicons/180.png">
<link rel="manifest" href="manifest.webmanifest">
<link rel="preload" href="/source/fonts/lato/Lato-Regular.woff2" as="font">
<link rel="preload" href="/source/fonts/oswald/oswaldregular.woff2" as="font">
<link rel="preload" href="/source/fonts/lato/Lato-Regular.woff2" as="font" crossorigin="anonymous">
<link rel="preload" href="/source/fonts/oswald/oswaldregular.woff2" as="font" crossorigin="anonymous">
</head>

<body>
Expand Down Expand Up @@ -45,8 +45,8 @@
<a class="site-list__link" href="catalog.html">каталог продукции</a>
</li>
<li class="site-list__item">
<a class="site-list__link site-list__link--active" href="#" aria-current="page"
tabindex="-1">подбор программы</a>
<a class="site-list__link site-list__link--active" href="#" aria-current="page" tabindex="-1">подбор
программы</a>
</li>
</ul>
</nav>
Expand Down Expand Up @@ -162,7 +162,7 @@ <h2 class="visually-hidden">Форма анкеты.</h2>
<span class="control__lead">питьевая вода</span>
</label>
</li>
<li class="field-group__item field-group__item--checkbox" >
<li class="field-group__item field-group__item--checkbox">
<label class="control control--checkbox">
<input class="control__input" name="additional" type="checkbox" value="milk">
<span class="control__lead">молоко</span>
Expand Down
5 changes: 4 additions & 1 deletion source/images/icons/arrow.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion source/images/icons/cat-pro.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion source/images/icons/cat-slim.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion source/images/icons/check.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion source/images/icons/gift.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion source/images/icons/ico-mail.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3e1117a

Please sign in to comment.