Skip to content

Commit

Permalink
Merge pull request #17 from Mishelinus/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@Mishelinus
Mishelinus committed Nov 6, 2022
2 parents 9f6eaa5 + f7d6b6b commit 87f19c4
Show file tree
Hide file tree
Showing 13 changed files with 288 additions and 269 deletions.
5 changes: 3 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ logs
# Ignore the build directory
/dist

# The file containing environment variables
# The file containing environment variables
.env

# Ignore IDE specific files
.idea/
.vscode/
*.sw*
.DS_Store
.DS_Store
test_slide.js
3 changes: 3 additions & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
css/style.min.css
js/modal.min.js
js/slide.min.js
14 changes: 6 additions & 8 deletions blank.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<meta name="theme-color" content="#ffffff">
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/fonts.css">
<link rel="stylesheet" href="css/style.min.css">
<link rel="stylesheet" href="css/style.css">
</head>

<body class="page-body">
Expand Down Expand Up @@ -108,30 +108,28 @@ <h3 class="visually-hidden"> Мы в социальных сетях</h3>
</section>
</div>
</footer>

<div class="overlay"></div>
<section class="modal modal__mail">
<h3>Напишите нам</h3>
<form class="mail-form" method="post" action="https://echo.htmlacademy.ru">
<div class="mail-form__box">
<p><label>Ваше имя:<br>
<input type="text" name="name" placeholder="Имя Фамилия" required>
<input type="text" name="name" placeholder="Имя Фамилия">
</label></p>


<p><label>Ваш email:<br>
<input type="email" name="email" placeholder="email@example.com " required>
<input type="email" name="email" placeholder="email@example.com ">
</label></p>
</div>
<label>Текст письма:<br>
<textarea name="text" placeholder="В свободной форме" required></textarea>
<textarea name="text" placeholder="В свободной форме"></textarea>
</label>
<input class="btn button" type="submit" value="Отправить">
</form>
<button class="btn-close" type="button" aria-label="Закрыть">
<span class="visually-hydden">закрыть</span>
</button>
</section>

<script src="js/modal.min.js"></script>
</body>

</html>
128 changes: 61 additions & 67 deletions catalog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<meta name="theme-color" content="#ffffff">
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/fonts.css">
<link rel="stylesheet" href="css/style.min.css">
<link rel="stylesheet" href="css/style.css">
</head>

<body class="page-body">
Expand Down Expand Up @@ -77,21 +77,20 @@ <h2 class="visually-hidden">Фильтр шаблонов</h2>
<ul class="filter__list-radio list-radio">
<li class="list-radio__item">
<input class="list-radio__input list__input visually-hidden" type="radio" name="grid" value="adaptive"
id="grids"
checked tabindex="0">
<label class="list-radio__label" for="grids" >Адаптивная
id="grids" checked tabindex="0">
<label class="list-radio__label" for="grids">Адаптивная
</label>

</li>
<li class="list-radio__item">
<input class="list-radio__input list__input visually-hidden" type="radio" name="grid" value="fixed"
id="fixeds" tabindex="0">
<label class="list-radio__label" for="fixeds" >Фиксированная</label>
<label class="list-radio__label" for="fixeds">Фиксированная</label>
</li>
<li class="list-radio__item">
<input class="list-radio__input list__input visually-hidden" type="radio" name="grid" value="elastic"
id="elastics" tabindex="0">
<label class="list-radio__label" for="elastics" >Резиновая
<label class="list-radio__label" for="elastics">Резиновая
</label>
</li>
</ul>
Expand All @@ -101,34 +100,31 @@ <h2 class="visually-hidden">Фильтр шаблонов</h2>
<ul class="filter__list-checkbox list-checkbox">
<li class="list-checkbox__item">
<input class="list-checkbox__input list__input visually-hidden" type="checkbox" name="checkbox"
value="slider"
id="check-1" checked disabled>
<label class="list-checkbox__label" for="check-1" > Слайдер </label>
value="slider" id="check-1" checked disabled>
<label class="list-checkbox__label" for="check-1"> Слайдер </label>
</li>
<li class="list-checkbox__item">
<input class="list-checkbox__input list__input visually-hidden" type="checkbox" name="checkbox"
value="advantages"
id="check-2">
<label class="list-checkbox__label" for="check-2" > Блок преимуществ</label>
value="advantages" id="check-2">
<label class="list-checkbox__label" for="check-2"> Блок преимуществ</label>
</li>
<li class="list-checkbox__item">

<input class="list-checkbox__input list__input visually-hidden" type="checkbox" name="checkbox"
value="news" id="check-3" checked disabled>
<label class="list-checkbox__label" for="check-3" > <span>Новости</span></label>
<label class="list-checkbox__label" for="check-3"> <span>Новости</span></label>
</li>
<li class="list-checkbox__item">

<input class="list-checkbox__input list__input visually-hidden" type="checkbox" name="checkbox"
value="galery"
id="check-4">
<label class="list-checkbox__label" for="check-4" > Галерея </label>
value="galery" id="check-4">
<label class="list-checkbox__label" for="check-4"> Галерея </label>
</li>
<li class="list-checkbox__item">

<input class="list-checkbox__input list__input visually-hidden" type="checkbox" name="checkbox"
value="basket" id="check-5">
<label class="list-checkbox__label" for="check-5" > Корзина</label>
<label class="list-checkbox__label" for="check-5"> Корзина</label>
</li>
</ul>
<button class=" filter-btn btn" type="submit" value="submit" name="submit">Показать
Expand Down Expand Up @@ -182,15 +178,15 @@ <h2 class="visually-hidden">Каталог шаблонов</h2>
<div class="card-product__browse">
<span></span>
</div>
<a href="product.html" class="card-product__link" >
<div class="card-product__img">
<picture>
<source srcset="img/templates/sedona_template.png">
<img class="card-product__image" src="img/templates/sedona_template.png" alt="Template Sedona"
width="358" height="578">
</picture>
</div>
</a>
<a href="product.html" class="card-product__link">
<div class="card-product__img">
<picture>
<source srcset="img/templates/sedona_template.png">
<img class="card-product__image" src="img/templates/sedona_template.png" alt="Template Sedona"
width="358" height="578">
</picture>
</div>
</a>

<div class="card-product__descr">
<h3 class="card-product__title">
Expand All @@ -207,9 +203,9 @@ <h3 class="card-product__title">
<span></span>
</div>
<a href="product.html" class="card-product__link">
<div class="card-product__img">
<img src="img/templates/pinkApp_template.png" alt="Template Pink" width="358" height="578">
</div>
<div class="card-product__img">
<img src="img/templates/pinkApp_template.png" alt="Template Pink" width="358" height="578">
</div>
</a>
<div class="card-product__descr">
<h3 class="card-product__title">
Expand All @@ -226,10 +222,9 @@ <h3 class="card-product__title">
<span></span>
</div>
<a href="product.html" class="card-product__link">
<div class="card-product__img">
<img src="img/templates/borodinski_template.png" alt="Template Borodinski" width="358"
height="578">
</div>
<div class="card-product__img">
<img src="img/templates/borodinski_template.png" alt="Template Borodinski" width="358" height="578">
</div>
</a>
<div class="card-product__descr">
<h3 class="card-product__title">
Expand All @@ -246,9 +241,9 @@ <h3 class="card-product__title">
<span></span>
</div>
<a href="product.html" class="card-product__link">
<div class="card-product__img">
<img src="img/templates/mishka_template.png" alt="Template Mishka" width="358" height="578">
</div>
<div class="card-product__img">
<img src="img/templates/mishka_template.png" alt="Template Mishka" width="358" height="578">
</div>
</a>
<div class="card-product__descr">
<h3 class="card-product__title">
Expand All @@ -265,9 +260,9 @@ <h3 class="card-product__title">
<span></span>
</div>
<a href="product.html" class="card-product__link">
<div class="card-product__img">
<img src="img/templates/Aplus_template.png" alt="Template A-Plus" width="358" height="578">
</div>
<div class="card-product__img">
<img src="img/templates/Aplus_template.png" alt="Template A-Plus" width="358" height="578">
</div>
</a>
<div class="card-product__descr">
<h3 class="card-product__title">
Expand All @@ -284,9 +279,9 @@ <h3 class="card-product__title">
<span></span>
</div>
<a href="product.html" class="card-product__link">
<div class="card-product__img">
<img src="img/templates/kvast_template.png" alt="Template Kvast" width="358" height="578">
</div>
<div class="card-product__img">
<img src="img/templates/kvast_template.png" alt="Template Kvast" width="358" height="578">
</div>
</a>
<div class="card-product__descr">
<h3 class="card-product__title">
Expand Down Expand Up @@ -362,7 +357,8 @@ <h3 class="visually-hidden"> Мы в социальных сетях</h3>
<li class="social__item">
<a href="#">
<span class="visually-hidden">мы в instagram</span>
<svg aria-hidden="true" focusable="false" width="21" height="21" viewBox="0 0 21 21" xmlns="http://www.w3.org/2000/svg">
<svg aria-hidden="true" focusable="false" width="21" height="21" viewBox="0 0 21 21"
xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M3 0H18C19.65 0 21 1.35 21 3V18C21 19.65 19.65 21 18 21H3C1.35 21 0 19.65 0 18V3C0 1.35 1.35 0 3 0ZM14 10.5C14 8.57 12.43 7 10.5 7C8.57 7 7 8.57 7 10.5C7 12.43 8.57 14 10.5 14C12.43 14 14 12.43 14 10.5ZM3 18V9H4.181C4.0626 9.49127 4.00186 9.99467 4 10.5C4 14.0899 6.91015 17 10.5 17C14.0899 17 17 14.0899 17 10.5C16.9986 9.99464 16.9379 9.49118 16.819 9H18V18H3ZM14 7H18V3H14V7Z" />
</svg>
Expand All @@ -376,30 +372,28 @@ <h3 class="visually-hidden"> Мы в социальных сетях</h3>
</section>
</div>
</footer>

<section class="modal modal__mail">
<h3>Напишите нам</h3>
<form class="mail-form" method="post" action="https://echo.htmlacademy.ru">
<div class="mail-form__box">
<p><label>Ваше имя:<br>
<input type="text" name="name" placeholder="Имя Фамилия" required>
</label></p>


<p><label>Ваш email:<br>
<input type="email" name="email" placeholder="email@example.com " required>
</label></p>
</div>
<label>Текст письма:<br>
<textarea name="text" placeholder="В свободной форме" required></textarea>
</label>
<input class="btn button" type="submit" value="Отправить">
</form>
<button class="btn-close" type="button" aria-label="Закрыть">
<span class="visually-hydden">закрыть</span>
</button>
</section>

<div class="overlay"></div>
<section class="modal modal__mail">
<h3>Напишите нам</h3>
<form class="mail-form" method="post" action="https://echo.htmlacademy.ru">
<div class="mail-form__box">
<p><label>Ваше имя:<br>
<input type="text" name="name" placeholder="Имя Фамилия">
</label></p>
<p><label>Ваш email:<br>
<input type="email" name="email" placeholder="email@example.com ">
</label></p>
</div>
<label>Текст письма:<br>
<textarea name="text" placeholder="В свободной форме"></textarea>
</label>
<input class="btn button" type="submit" value="Отправить">
</form>
<button class="btn-close" type="button" aria-label="Закрыть">
<span class="visually-hydden">закрыть</span>
</button>
</section>
<script src="js/modal.min.js"></script>
</body>

</html>

0 comments on commit 87f19c4

Please sign in to comment.