Skip to content

Тарачева Екатерина #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taracheva wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Тарачева Екатерина #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d7e3b5
first version
taracheva Mar 29, 2018
6ea830c
fix
taracheva Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added YandexSansDisplay-Thin.ttf
View file
Open in desktop
Binary file not shown.
34 changes: 34 additions & 0 deletions form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.form
{
grid-area: form;
background-color: white;
padding: 0 30px 30px;
margin: 10px 10px 0;
}

.field
{
clear: both;
text-align: right;
margin-bottom: 16px;
}

label
{
float: left;
margin-right: 160px;
}

.form__wrap
{
float: left;
}

@media screen and (max-width: 1200px) and (min-width: 720px)
{
.form
{
margin: 0 125px;
}

}
87 changes: 87 additions & 0 deletions header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
.header
{
padding: 15px;
}

.header__name
{
font: 50px 'YandexSans';
display: inline-block;
font-weight: bold;
}

.header__input
{
display: inline-block;
position: absolute;
padding-top: 18px;
padding-left: 20px;
width: 65%;
}

.input__search
{
width: 85%;
height: 35px;
outline: none;
border: 2px solid #dcdcdc;
}

.input__button
{
height: 41px;
width: 10%;
margin-left: -5px;
background-color: #dcdcdc;
outline: none;
box-shadow: 0;
}

.input__icon_hidden
{
display: none;
outline: none;
vertical-align: middle;
}

@media screen and (max-width: 1200px) and (min-width: 720px)
{
.input__button
{
display: none;
}

.input__icon_search
{
display: inline-block;
}

.input__search
{
border: none;
}

.input__search:focus
{
border: 2px solid #dcdcdc;
}
}

@media screen and (max-width: 720px)
{
.input__icon_hamburger
{
display: inline-block;
}

.input__search
{
display: block;
}

.input__button,
.input__icon_search
{
display: none;
}
}
Binary file added icons/hamburger.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/magnifier.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/img.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 72 additions & 0 deletions index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
@import './header.css';
@import './nav.css';
@import './items.css';
@import './popularItems.css';
@import './form.css';

@font-face
{
font-family: 'YandexSans';
src: url(YandexSansDisplay-Thin.ttf);
}

body
{
font: 18px Helvetica, sans-serif;
}

a
{
text-decoration: none;
color: #4169e0;
}

.wrapper
{
margin: 20px 0 60px;
background-color: #dcdcdc;
padding: 45px 0;
display: grid;
}

@media screen and (min-width: 1200px)
{

.wrapper
{
grid-template-columns: 30px 230px auto 230px 30px;
grid-template-rows: auto;
grid-gap: 15px;
grid-template-areas: '. nav items popular .'
'. . items . .'
'. . form . .';
}
}

@media screen and (max-width: 1200px) and (min-width: 720px)
{
.wrapper
{
grid-template-columns: 15px auto 15px;
grid-template-rows: auto;
grid-gap: 30px;
grid-template-areas: '. nav .'
'. items .'
'. popular .'
'. form .';
}

}

@media screen and (max-width: 720px)
{
.wrapper
{
grid-template-columns: 1fr 450px 1fr;
grid-template-rows: auto;
grid-gap: 30px;
grid-template-areas: '. popular .'
'. items .'
'. form .';
}
}
152 changes: 152 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,162 @@
<!DOCTYPE html>
<html lang="ru">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<title>Задача «Тим слишком занят»</title>
<link rel="stylesheet" href="./index.css">
</head>

<body>
<main>
<header class="header">
<span class="header__name">Билли.Маркет</span>
<div class="header__input">
<input class="input__search input__search_focus input__search_ya" type="text">
<input class="input__button" type="button" value="Найти">
<input class="input__icon_search input__icon_hidden" alt=" "
type="image" src="./icons/magnifier.png">
<input class="input__icon_hamburger input__icon_hidden" alt=" "
type="image" src="./icons/hamburger.png">
</div>
</header>
<div class="wrapper">
<div class="nav">
<div>
<a href="#">Морские ракушки</a>
</div>
<div>
<a href="#">Сунвениры из тайланда</a>
</div>
<div>
<a href="#">Автомобили тесла</a>
</div>
<div>
<a href="#">Марки из разных стран</a>
</div>
<br>
<br>
<div class="nav__order">
<a href="#">Заказать сувенир</a>
</div>
</div>
<div class="items">
<div class="item">
<div class="item__wrap">
<div class="item__img">
<img class="item__imgSource" alt="Ракушка" src="./images/img.png">
</div>
<div class="item__subtitle">
<a href="#">Ракушка морская</a>
</div>
<div class="item__price">100 &#8381;</div>
<div class="item__rating">
<span class="rating__score">4.5</span>
<div class="rating__corner">
<div class="rating__triangle"></div>
</div>
</div>
<span class="rating__feedbackCount">111 отзывов</span>
</div>
</div>
<div class="item">
<div class="item__wrap">
<div class="item__img">
<img class="item__imgSource" alt="Ракушка" src="./images/img.png">
</div>
<div class="item__subtitle">
<a href="#">Ракушка морская</a>
</div>
<div class="item__price">100 &#8381;</div>
<div class="item__rating">
<span class="rating__score">4.5</span>
<div class="rating__corner">
<div class="rating__triangle"></div>
</div>
</div>
<span class="rating__feedbackCount">111 отзывов</span>
</div>
</div>
<div class="item">
<div class="item__wrap">
<div class="item__img">
<img class="item__imgSource" alt="Ракушка" src="./images/img.png">
</div>
<div class="item__subtitle">
<a href="#">Ракушка морская</a>
</div>
<div class="item__price">100 &#8381;</div>
<div class="item__rating">
<span class="rating__score">4.5</span>
<div class="rating__corner">
<div class="rating__triangle"></div>
</div>
</div>
<span class="rating__feedbackCount">111 отзывов</span>
</div>
</div>
<div class="item">
<div class="item__wrap">
<div class="item__img">
<img class="item__imgSource" alt="Ракушка" src="./images/img.png">
</div>
<div class="item__subtitle">
<a href="#">Ракушка морская</a>
</div>
<div class="item__price">100 &#8381;</div>
<div class="item__rating">
<span class="rating__score">4.5</span>
<div class="rating__corner">
<div class="rating__triangle"></div>
</div>
</div>
<span class="rating__feedbackCount">111 отзывов</span>
</div>
</div>
</div>
<div class="popularItems">
<h3 class="popularItems__head">
Популярные товары
</h3>
<div class="popularItems__items">
<div>
<a href="#">Ракушка морская</a>
</div>
<div>
<a href="#">Чесалка для спины</a>
</div>
<div>
<a href="#">Четки</a>
</div>
</div>
</div>
<div class="form">
<h1>Заказать сувенир</h1>
<div class="form__wrap">
<div class="field">
<label for="count">Количество:</label>
<input id="count" type="text">
</div>
<div class="field">
<label for="city">Город:</label>
<input id="city" type="text">
</div>
<div class="field">
<label for="email">Email:</label>
<input id="email" type="text" placeholder="email">
</div>
<div class="field">
<label for="phone">Телефон:</label>
<input id="phone" type="text" placeholder="Номер телефона*">
</div>
<div class="field">
<label for="date">Дата доставки:</label>
<input id="date" type="text" placeholder="дд.мм.гггг">
</div>
</div>
</div>
</div>
</main>
</body>
</html>
Loading