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

Jump to bottom

updates #12

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

updates #12

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
0a84c79
...
2bj May 31, 2016
73ea953
updates
2bj Jun 1, 2016
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 modified build/css/fonts/svgfont.eot
View file
Open in desktop
Binary file not shown.
Binary file modified build/css/fonts/svgfont.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified build/css/fonts/svgfont.woff
View file
Open in desktop
Binary file not shown.
Binary file modified build/css/fonts/svgfont.woff2
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions build/css/style.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/css/style.css.map
View file
Open in desktop

Large diffs are not rendered by default.

157 changes: 82 additions & 75 deletions build/dislife-allnews-1300.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,65 +28,72 @@
<span></span>
</button>
<div class="header__inner">

<nav class="nav js-nav" data-nav="main-nav">
<ul class="nav__list">
<li class="nav__item">
<a href="#" class="nav__link is-brown">
<div class="nav__link-in">
<span>Здоровье</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-purple">
<div class="nav__link-in">
<span>Образование</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-yellow">
<div class="nav__link-in">
<span>Маленькая политика</span>
</div>
</a>
</li>
<li class="nav__item nav-specials js-nav-specials">
<a href="#" class="nav-specials__link nav__link is-orange js-specials-link">
<div class="nav__link-in">
<span>Спецпроекты</span>
<i class="fa fa-chevron-down"></i>
</div>
</a>
<ul class="nav-specials__list js-specials-drop">
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Патронус</span>
<small>Детский правозащитный проект</small>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Пазлы</span>
<small>Знакомства для инвалидов</small>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Бюро справедливости</span>
<small>Обратиться к депутату</small>
</div>
</a>
</li>
</ul>
</li>
</ul>
<ul class="nav__list">
<li class="nav__item">
<a href="#" class="nav__link is-brown">
<div class="nav__link-in">
<span>Здоровье</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-purple">
<div class="nav__link-in">
<span>Льготы</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-yellow">
<div class="nav__link-in">
<span>Общество</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-black">
<div class="nav__link-in">
<span>Трудоустройство</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Знакомства</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Форум</span>
</div>
</a>
</li>
<li class="nav__item nav-specials js-nav-specials">
<a href="#" class="nav-specials__link nav__link is-orange js-specials-link">
<div class="nav__link-in">
<span>Помощь</span>
<i class="fa fa-chevron-down"></i>
</div>
</a>
<ul class="nav-specials__list js-specials-drop">
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Бюро справедливости</span>
<small>Обратиться к депутату</small>
</div>
</a>
</li>
</ul>
</li>
</ul>
</nav>

<a href="#" class="btn-enter js-open-popup" data-link="popup-login">
<i class="fa fa-sign-in"></i>
<span>Вход</span>
Expand Down Expand Up @@ -335,24 +342,24 @@ <h2 class="h2 h2_mb">Главное сейчас</h2>
<!-- end more -->
</div>
<footer class="footer">
<div class="footer__top">
<div class="container">
<div class="footer__text">
<a href="#" class="footer__logo">
<img src="img/footer-logo.svg" alt="">
</a>
<div class="footer__question">КАК ЖИТЬ В РОССИИ И НЕ УМЕРЕТЬ</div>
</div>
<div class="subscribe">
<div class="subscribe__label">Подпишитесь на еженедельную рассылку:</div>
<form action="" class="subscribe__form">
<input type="text" class="subscribe__input" placeholder="Ваш e-mail">
<i class="fa fa-envelope-o"></i>
<button class="subscribe__btn">Подписаться</button>
</form>
</div>
</div>
</div>
<!--<div class="footer__top">-->
<!--<div class="container">-->
<!--<div class="footer__text">-->
<!--<a href="#" class="footer__logo">-->
<!--<img src="img/footer-logo.svg" alt="">-->
<!--</a>-->
<!--<div class="footer__question">КАК ЖИТЬ В РОССИИ И НЕ УМЕРЕТЬ</div>-->
<!--</div>-->
<!--<div class="subscribe">-->
<!--<div class="subscribe__label">Подпишитесь на еженедельную рассылку:</div>-->
<!--<form action="" class="subscribe__form">-->
<!--<input type="text" class="subscribe__input" placeholder="Ваш e-mail">-->
<!--<i class="fa fa-envelope-o"></i>-->
<!--<button class="subscribe__btn">Подписаться</button>-->
<!--</form>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="footer__bottom">
<div class="container">
<ul class="footer__social">
Expand Down
157 changes: 82 additions & 75 deletions build/dislife-instruction-simple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,65 +27,72 @@
<span></span>
</button>
<div class="header__inner">

<nav class="nav js-nav" data-nav="main-nav">
<ul class="nav__list">
<li class="nav__item">
<a href="#" class="nav__link is-brown">
<div class="nav__link-in">
<span>Здоровье</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-purple">
<div class="nav__link-in">
<span>Образование</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-yellow">
<div class="nav__link-in">
<span>Маленькая политика</span>
</div>
</a>
</li>
<li class="nav__item nav-specials js-nav-specials">
<a href="#" class="nav-specials__link nav__link is-orange js-specials-link">
<div class="nav__link-in">
<span>Спецпроекты</span>
<i class="fa fa-chevron-down"></i>
</div>
</a>
<ul class="nav-specials__list js-specials-drop">
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Патронус</span>
<small>Детский правозащитный проект</small>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Пазлы</span>
<small>Знакомства для инвалидов</small>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Бюро справедливости</span>
<small>Обратиться к депутату</small>
</div>
</a>
</li>
</ul>
</li>
</ul>
<ul class="nav__list">
<li class="nav__item">
<a href="#" class="nav__link is-brown">
<div class="nav__link-in">
<span>Здоровье</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-purple">
<div class="nav__link-in">
<span>Льготы</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-yellow">
<div class="nav__link-in">
<span>Общество</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-black">
<div class="nav__link-in">
<span>Трудоустройство</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Знакомства</span>
</div>
</a>
</li>
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Форум</span>
</div>
</a>
</li>
<li class="nav__item nav-specials js-nav-specials">
<a href="#" class="nav-specials__link nav__link is-orange js-specials-link">
<div class="nav__link-in">
<span>Помощь</span>
<i class="fa fa-chevron-down"></i>
</div>
</a>
<ul class="nav-specials__list js-specials-drop">
<li class="nav__item">
<a href="#" class="nav__link is-orange">
<div class="nav__link-in">
<span>Бюро справедливости</span>
<small>Обратиться к депутату</small>
</div>
</a>
</li>
</ul>
</li>
</ul>
</nav>

<a href="#" class="btn-enter js-open-popup" data-link="popup-login">
<i class="fa fa-sign-in"></i>
<span>Вход</span>
Expand Down Expand Up @@ -330,24 +337,24 @@ <h2 class="h2 h2_mb">Главное сейчас</h2>
</div>
<!-- end more -->
<footer class="footer">
<div class="footer__top">
<div class="container">
<div class="footer__text">
<a href="#" class="footer__logo">
<img src="img/footer-logo.svg" alt="">
</a>
<div class="footer__question">КАК ЖИТЬ В РОССИИ И НЕ УМЕРЕТЬ</div>
</div>
<div class="subscribe">
<div class="subscribe__label">Подпишитесь на еженедельную рассылку:</div>
<form action="" class="subscribe__form">
<input type="text" class="subscribe__input" placeholder="Ваш e-mail">
<i class="fa fa-envelope-o"></i>
<button class="subscribe__btn">Подписаться</button>
</form>
</div>
</div>
</div>
<!--<div class="footer__top">-->
<!--<div class="container">-->
<!--<div class="footer__text">-->
<!--<a href="#" class="footer__logo">-->
<!--<img src="img/footer-logo.svg" alt="">-->
<!--</a>-->
<!--<div class="footer__question">КАК ЖИТЬ В РОССИИ И НЕ УМЕРЕТЬ</div>-->
<!--</div>-->
<!--<div class="subscribe">-->
<!--<div class="subscribe__label">Подпишитесь на еженедельную рассылку:</div>-->
<!--<form action="" class="subscribe__form">-->
<!--<input type="text" class="subscribe__input" placeholder="Ваш e-mail">-->
<!--<i class="fa fa-envelope-o"></i>-->
<!--<button class="subscribe__btn">Подписаться</button>-->
<!--</form>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="footer__bottom">
<div class="container">
<ul class="footer__social">
Expand Down
Loading