Skip to content

Week4 #2

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
rucreatizer wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Week4 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49a2907
Воскресенье, начал делать адаптив
Dec 24, 2017
c700ba8
Исправлены ссылки в подвалах
Dec 25, 2017
bf08362
Начал адаптив
Dec 25, 2017
62bb5b3
Merge branch 'week3' into gh-pages
Dec 25, 2017
32f6d99
no slider and backend
Jan 14, 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
69 changes: 38 additions & 31 deletions build/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,34 @@
<meta content="ie=edge" http-equiv="x-ua-compatible">
<link rel="stylesheet" href="./assets/styles/app.min.css">
<script src="./assets/scripts/bundle.js" defer></script>
<script src="https://code.jquery.com/jquery-2.1.4.min.js" defer></script>
<script src="https://cdn.rawgit.com/nnattawat/flip/master/dist/jquery.flip.min.js" defer></script>
</head>
<body>
<div class="mobile-menu mobile-menu__hidden" id="mobile-menu">
<ul class="mobile-menu__list">
<li class="mobile-menu__item"><a class="mobile-menu__url mobile-menu__title" href="./my-works.html">мои работы</a></li>
<li class="mobile-menu__item"> <a class="mobile-menu__url mobile-menu__title" href="./blog.html">блог</a></li>
<li class="mobile-menu__item"> <a class="mobile-menu__url mobile-menu__title" href="./about.html">обо мне</a></li>
<li class="mobile-menu__item"> <a class="mobile-menu__url mobile-menu__title" href="./index.html">авторизация</a></li>
</ul>
<div class="close-mobile-menu" id="close-mobile-menu"></div>
</div>
<div class="wrapper wrapper__about">
<div class="section section__top">
<div class="wrapper-header">
<div class="header">
<div class="social__list">
<svg class="social__item social__item_about">
<use xlink:href="./assets/images/svg/symbols.svg#vk"></use>
</svg>
<svg class="social__item social__item_about">
<use xlink:href="./assets/images/svg/symbols.svg#github"></use>
</svg>
<svg class="social__item social__item_about">
<use xlink:href="./assets/images/svg/symbols.svg#in"></use>
</svg>
</div>
<div class="menu"></div>
<div class="social__list"><a href="https://vk.com/mischenkomi" target="_blank">
<svg class="social__item social__item_header">
<use xlink:href="./assets/images/svg/symbols.svg#vk"></use>
</svg></a><a href="https://github.com/rucreatizer/" target="_blank">
<svg class="social__item social__item_header">
<use xlink:href="./assets/images/svg/symbols.svg#github"></use>
</svg></a><a href="https://www.instagram.com/spectender.ru/" target="_blank">
<svg class="social__item social__item_header">
<use xlink:href="./assets/images/svg/symbols.svg#in"></use>
</svg></a></div>
<div class="menu" id="burgermenu"></div>
</div>
</div>
<div class="info"><img class="avatar" src="./assets/images/avatar.jpg">
Expand Down Expand Up @@ -183,27 +193,24 @@
<section class="footer">
<div class="footer__menu">
<ul class="menu__items">
<li class="menu__item"><a href="/welcome.html">Главная</a></li>
<li class="menu__item"><a href="/about.html">Обо мне</a></li>
<li class="menu__item"><a href="my-works.html">Мои работы</a></li>
<li class="menu__item"><a href="blog.html">Блог</a></li>
<li class="menu__item"><a href="./index.html">Главная</a></li>
<li class="menu__item"><a href="./about.html">Обо мне</a></li>
<li class="menu__item"><a href="./my-works.html">Мои работы</a></li>
<li class="menu__item"><a href="./blog.html">Блог</a></li>
</ul>
<ul class="footer__social_items">
<li class="footer__social_item">
<svg class="social__item footer__social_item">
<use xlink:href="./assets/images/svg/symbols.svg#vk_round"></use>
</svg>
</li>
<li class="footer__social_item">
<svg class="social__item footer__social_item">
<use xlink:href="./assets/images/svg/symbols.svg#github_round"></use>
</svg>
</li>
<li class="footer__social_item">
<svg class="social__item footer__social_item">
<use xlink:href="./assets/images/svg/symbols.svg#in_round"></use>
</svg>
</li>
<li class="footer__social_item"><a href="https://vk.com/mischenkomi" target="_blank">
<svg class="social__item footer__social_item">
<use xlink:href="./assets/images/svg/symbols.svg#vk_round"></use>
</svg></a></li>
<li class="footer__social_item"><a href="https://github.com/rucreatizer/" target="_blank">
<svg class="social__item footer__social_item">
<use xlink:href="./assets/images/svg/symbols.svg#github_round"></use>
</svg></a></li>
<li class="footer__social_item"><a href="https://www.instagram.com/spectender.ru/" target="_blank">
<svg class="social__item footer__social_item">
<use xlink:href="./assets/images/svg/symbols.svg#in_round"></use>
</svg></a></li>
</ul>
</div>
<div class="footer__down-text">
Expand Down
96 changes: 96 additions & 0 deletions build/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<!DOCTYPE html>
<html lang="ru-RU">
<head>
<meta charset="utf-8">
<title></title>
<meta content="" name="description">
<meta content="" name="keywords">
<meta content="width=device-width, initial-scale=1" name="viewport">
<meta content="ie=edge" http-equiv="x-ua-compatible">
<link rel="stylesheet" href="./assets/styles/app.min.css">
<script src="./assets/scripts/bundle.js" defer></script>
<script src="https://code.jquery.com/jquery-2.1.4.min.js" defer></script>
<script src="https://cdn.rawgit.com/nnattawat/flip/master/dist/jquery.flip.min.js" defer> </script>
</head>
<body>
<div class="admin__wrapper2">
<div class="admin__wrapper">
<header class="admin__header"><span class="admin__main_title">Панель администрирования</span><a class="back__site" href="index.html">Вернуться на сайт</a></header>
<div class="nav">
<ul class="nav__items">
<li class="nav__item" id="item1"><a class="nav__url" href="#">tab 1</a></li>
<li class="nav__item" id="item2"><a class="nav__url" href="#">tab 2</a></li>
<li class="nav__item" id="item3"><a class="nav__url" href="#">tab 3</a></li>
<li class="nav__item" id="item4"><a class="nav__url" href="#">tab 4</a></li>
</ul>
</div>
<section class="admin__pages">
<div class="admin__page1" id="page1">
<form class="admin__form" action="#" method="post" name="admin_form_about"><span class="admin__title">Страница "Обо мне"</span>
<div class="admin__about_techs">
<div class="admin__about_frontend"><span class="admin__about_title">Frontend</span>
<ul class="admin__about_items">
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">%</span>
</li>
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">%</span>
</li>
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">% </span>
</li>
</ul>
</div>
<div class="admin__about_frontend"><span class="admin__about_title">Frontend</span>
<ul class="admin__about_items">
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">%</span>
</li>
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">%</span>
</li>
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">%</span>
</li>
</ul>
</div>
<div class="admin__about_frontend"><span class="admin__about_title">Frontend</span>
<ul class="admin__about_items">
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">%</span>
</li>
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">%</span>
</li>
<li class="admin__about_item"><span class="admin__about_item_title">Html</span>
<input class="admin_about_item_input" type="text" name="html"><span class="admin__about_item_percent">%</span>
</li>
</ul>
</div>
</div>
<input class="admin__button" type="submit" value="Сохранить">
</form>
</div>
<div class="admin__page_2 block__hidden" id="page2"><span class="admin__title">Страница "Блог"</span>
<form class="admin__form" action="#" method="post" name="admin_form_blog"><span class="admin__subtitle">Добавить запись</span>
<input class="admin_about_item_input admin_about_item_input_second" type="text" placeholder="Название" name="blog_title">
<input class="admin_about_item_input admin_about_item_input_second" type="date" placeholder="Дата" name="blog_date">
<textarea class="admin_about_item_textarea" placeholder="Содержание" name="blog_text"></textarea>
<input class="admin__button" type="submit" value="Добавить">
</form>
</div>
<div class="admin__page_3 block__hidden" id="page3"><span class="admin__title">Мои работы</span>
<form class="admin__form" ation="#" method="post" name="admin_form_works"><span class="admin__about_item_title">Добавить работу</span>
<input class="admin_about_item_input_second" type="text" placeholder="Название проекта" name="work_name">
<input class="admin_about_item_input_second" type="date" placeholder="Технологии" name="work_tech">
<label class="admin__file" for="work_img"><img class="admin_work_img" src="./assets/images/insert_image_admin.png" alt="">
<input type="file" name="work_img" id="work_img"><span class="admin__about_item_title admin__about_item_title_file">Загрузить картинку</span>
</label>
<input class="admin__button" type="submit" value="Добавить">
</form>
</div>
</section>
</div>
</div>
</body>
</html>
Binary file added build/assets/images/1.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 build/assets/images/2.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 build/assets/images/3.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 build/assets/images/4.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 build/assets/images/dima.jpg
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 build/assets/images/insert_image_admin.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 build/assets/images/map.jpg
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 build/assets/images/tr-bottom.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 build/assets/images/tr-top.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 build/assets/images/user.jpg
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 build/assets/images/welcome1.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 build/assets/images/welcome2.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 build/assets/images/welcome3.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 build/assets/images/welcome4.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 build/assets/images/welcome5.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 build/assets/images/welcome6.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 build/assets/images/welcome8.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 build/assets/images/zar.jpg
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