Skip to content
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

myPR #6

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+864 −130
Open

myPR #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0752776
hw
koretskyi Aug 13, 2019
f779af7
second try
koretskyi Aug 13, 2019
bf29591
third try
koretskyi Aug 13, 2019
b7b67fe
fourth attempt
koretskyi Aug 13, 2019
7c379ec
next attempt
koretskyi Aug 13, 2019
e431698
my sol
koretskyi Aug 13, 2019
61a5280
test
koretskyi Aug 13, 2019
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
30 changes: 0 additions & 30 deletions dist/images/logo.svg
View file
Open in desktop

This file was deleted.

242 changes: 232 additions & 10 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,235 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
<link rel="stylesheet" href="./styles/main.css">
</head>
<body>
<img src="./images/logo.svg" alt="Logo">
<h1>Hello Mate academy</h1>
<script type="text/javascript" src="scripts/main.js"></script>
</body>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Uber eats</title>
<link href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i&display=swap&subset=cyrillic" rel="stylesheet">
<link rel="stylesheet" href="styles/main.css">
<link rel="stylesheet" href="styles/media__query.css">
</head>
<body>
<header>
<div class="header box-content">
<a href="#" name="back_to_top" class="logo">
uber <span>eats</span>
</a>
<form action="#" method="GET" class="asap">
<div class="asap">
<input type="button" name="asap__button" value="ASAP" class="filead asap__button button">
<p class="asap__text">to</p>
<div class="asap__adres filead">
<img src="./images/icon/Group.png" alt="">
<input type="text" name="asap__adres" value="ul. Bolshaya Dmitrov" placeholder="some address">
</div>

</div>
</form>
<div class="inits_button">
<a href="#" class="sign-in filead button">Sign in</a>
<a href="#" class="register filead button">register</a>
<a href="#" class="basket"><img src="./img/icon/basket.svg" alt=""></a>
</div>
</div>
</header>
<main>
<div class="box-content">
<div class="search">
<img src="images/icon/Shape.svg" alt="">
<input type="search" name="search" class="search__input" value="" placeholder="Search for restaurant">
</div>
<div class="mein-content">
<h1>Moscow Restaurants</h1>
<div class="menue">
<div class="menue__item ">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-27.png" alt="">
<p class="menue__item__restaurant">Макдоналдс</p>
<ul class="menue__item__tag double__tag">
<li>
Бургери
</li>
</ul>
<p class="menue__item__time"> 25-35 Min </p>
</div>
<div class="menue__item">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-272.png" alt="">
<p class="menue__item__restaurant">WOKWEI</p>
<ul class="menue__item__tag one__tag">
<li>
Китайська
</li>
<li>
Азіатська
</li>
</ul>
<p class="menue__item__time"> 40-50 Min </p>
</div>
<div class="menue__item">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-273.png" alt="">
<p class="menue__item__restaurant">YIZHA</p>
<ul class="menue__item__tag double__tag">
<li>
Американська
</li>
<li>
Бургери
</li>
<li>
Вулична їжа
</li>
</ul>
<p class="menue__item__time"> 35-45 Min </p>
</div>
<div class="menue__item">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-274.png" alt="">
<p class="menue__item__restaurant">Musafir (вул. Саксаганська)</p>
<ul class="menue__item__tag double__tag">
<li>
Близькосхідна
</li>
</ul>
<p class="menue__item__time"> 30-40 Min </p>
</div>
<div class="menue__item">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-276.png" alt="">
<p class="menue__item__restaurant">WOKWEI</p>
<ul class="menue__item__tag one__tag">
<li>
Китайська
</li>
<li>
Азіатська
</li>
</ul>
<p class="menue__item__time"> 40-50 Min </p>
</div>
<div class="menue__item">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-277.png" alt="">
<p class="menue__item__restaurant">Milk Bar</p>
<ul class="menue__item__tag double__tag">
<li>
Десерти
</li>
<li>
Європейська
</li>
</ul>
<p class="menue__item__time"> 25-35 Min </p>
</div>
<div class="menue__item">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-2778.png" alt="">
<p class="menue__item__restaurant">Mimosa Brookly Pizza</p>
<ul class="menue__item__tag double__tag">
<li>
Італійська
</li>
<li>
Піца
</li>
<li>
Американська
</li>
</ul>
<p class="menue__item__time"> 15-25 Min </p>
</div>
<div class="menue__item">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-278.png" alt="">
<p class="menue__item__restaurant">To Be</p>
<ul class="menue__item__tag double__tag">
<li>
Японська
</li>
<li>
Азіатська
</li>
<li>
Суші
</li>
</ul>
<p class="menue__item__time"> 25-35 Min </p>
</div>
<div class="menue__item">
<img src="images/menue__items__img/95b745f6ce6a45903c3ed254afd72e46-w550-279.png" alt="">
<p class="menue__item__restaurant">Druzi Cafe (вул. Прорізна)</p>
<ul class="menue__item__tag double__tag">
<li>
Бургери
</li>
</ul>
<p class="menue__item__time"> 30-40 Min </p>
</div>

</div>
</div>
</div>
</main>
<footer>
<div class="box-content">
<div class="footer__logo">
<a href="#" class="logo">
uber <span>eats</span>
</a>
</div>
<div class="footer__info">
<ul>
<li class="select__lang">
<img class="globe" src="images/icon/Shape1.svg" alt="">
<select class="" name="">
<option value="Eng">ENGLISH</option>
<option value="Ua">УКРАЇНСЬКА</option>
</select>
<img class="arr__down" src="images/icon/Arr__down.png" alt="">
</li>
<li class="logo__tag">
<a href="#"><span>#</span>UberEats</a>
</li>
<li class="soc__tag">
<a href="#"><img src="images/icon/facebook__icon.svg" alt=""></a>
<a href="#"><img src="images/icon/tweeter__icon.svg" alt=""></a>
<a href="#"><img src="images/icon/instagram__icon.svg" alt=""></a>
</li>
</ul>
<ul>
<li>
<a href="#">About UberEats</a>
</li>
<li>
<a href="#">Become a Delivery Pa</a>
</li>
<li>
<a href="#">Become a Restaurant</a>
</li>
</ul>
<ul>
<li>
<a href="#">See all cities</a>
</li>
<li>
<a href="#">Pricing</a>
</li>
<li>
<a href="#">Help</a>
</li>
<li>
<a href="#">FAQs</a>
</li>
</ul>

</div>
<div class="footer__stores">
<a href="#"><img src="images/Stores__img/en_badge_web_generic-cf6dad406f.png" alt=""></a>
<a href="#"><img src="images/Stores__img/Group.png" alt=""></a>
</div>
<div class="footer__end">
<a href="#">© 2017 Uber Technolo</a>
<a href="#">Privacy</a>
<a href="#">Terms</a>
</div>
<a href="#back_to_top" class="button__up">
<img src="images/icon/Arr__up.svg" alt="">
</a>
</div>
</footer>
</body>
</html>
2 changes: 0 additions & 2 deletions dist/scripts/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
'use strict';

console.log('hello mate academy!');
14 changes: 0 additions & 14 deletions dist/styles/main.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dist/styles/main.css.map
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://koretskyi.github.io/gulp-template/
Binary file added src/images/Stores__img/Group.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 src/images/Stores__img/en_badge_web_generic-cf6dad406f.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 src/images/icon/Arr__down.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.
3 changes: 3 additions & 0 deletions src/images/icon/Arr__up.svg
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 src/images/icon/Group.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.
3 changes: 3 additions & 0 deletions src/images/icon/Shape.svg
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.
3 changes: 3 additions & 0 deletions src/images/icon/Shape1.svg
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.
6 changes: 6 additions & 0 deletions src/images/icon/basket.svg
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.
3 changes: 3 additions & 0 deletions src/images/icon/facebook__icon.svg
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.
3 changes: 3 additions & 0 deletions src/images/icon/instagram__icon.svg
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.
Loading