правки с сервера

remotes/origin/yandex
apache 9 years ago
parent 063d2c2013
commit 4ad8b35a61
  1. BIN
      project/static/PD.pdf
  2. 49
      project/static/css/style.css
  3. BIN
      project/static/dogovor.pdf
  4. BIN
      project/static/img/gotopay-hover.png
  5. BIN
      project/static/img/lamp-off.png
  6. BIN
      project/static/img/lamp.png
  7. BIN
      project/static/img/triangle.png
  8. 33
      project/templates/base.html
  9. 6
      project/templates/myauth/register.html
  10. 1
      project/templates/myauth/register_form.html
  11. 2
      project/templates/myauth/reset_form.html
  12. 13
      project/templates/pages/index.html

Binary file not shown.

@ -45,7 +45,7 @@ body {
height:100%;
}
#bg-header {background:#fff;position:absolute;top:0;height:150px;width:100%;}
#bg-index {background:url(../img/index-banner.png) no-repeat top center;position:absolute;top:150px;height:551px;width:100%;}
#bg-index {background:url(../img/index-banner.png) no-repeat top center #313942;position:absolute;top:150px;height:551px;width:100%;}
#bg-index-promo {background:url(../img/index-promo-bg.jpg)#38424c;position:absolute;top:701px;height:200px;width:100%;}
#body {
height:auto;
@ -78,15 +78,15 @@ body {
.register:hover {background: url(../img/register-black.png) no-repeat 9px center;}
.register_active {background: url(../img/register-black.png) no-repeat 9px center;}
.index-banner-text {height:551px;width:800px;color:#fff;font-size:24px;font-family:"MyriadProRegular";position:relative;overflow:hidden;text-shadow:#000 0 0 6px;}
.index-banner-text h1 {font-size:48px;}
.index-banner-text {height:551px;width:800px;color:#fff;font-size:24px;font-family:"MyriadPro-Light";position:relative;overflow:hidden;text-shadow:#000 0 0 6px;}
.index-banner-text h1 {font-size:40px;}
.index-banner-btn {width:800px;display:table;text-shadow: none;}
.index-register, .index-banner-btn p {display:table-cell;vertical-align:middle;padding:10px;}
.index-banner-btn p {width:440px;font-size:16px;background:#f0f0f0;color:#4e5661;}
.index-banner-btn p {width: 440px;font-size: 19px;background: #f0f0f0;color: #4e5661;font-family:"MyriadPro-Light";}
.index-register {font-size:28px;text-decoration:none;text-transform:uppercase;color:#4e5661;background:#fed13e;text-align:center;font-family:'MyriadProCondensed';}
.index-register:hover {font-size:28px;text-decoration:none;text-transform:uppercase;color:#4e5661;background:#ffca3e;text-align:center;font-family:'MyriadProCondensed';}
.index-promo {height:200px;width:100%;position:relative;display:table-cell;vertical-align:middle;}
.index-promo {width:100%;position:relative;display:table-cell;vertical-align:middle;padding: 40px 0 0 0;}
.index-promo .round {height:116px;width:116px;position:relative;border-radius:59px;float:left;margin-right:10px;}
.index-promo .round1 {background:#fed13e url(../img/index-promo-1.png) no-repeat center center;}
.index-promo .round2 {background:#fed13e url(../img/index-promo-2.png) no-repeat center center;}
@ -97,26 +97,27 @@ body {
.index-promo-text .text p {color:#fff;margin:5px 0;font-size:18px;}
#reasons {position:relative;margin-bottom:260px;}
.extended-block {width:1200px;height:110px;overflow:visible;cursor:pointer;padding-right:650px;box-sizing:border-box;}
.extended-block .order {font-family:"MyriadProCondensed";font-size:110px;line-height:110px;font-weight:normal;color:#e0e0e0;}
.extended-block {width:1200px;height:110px;overflow:visible;cursor:pointer;padding-right:650px;box-sizing:border-box;margin-bottom: 20px;}
.extended-block .order {font-family:"Times New Roman" serif;font-size:130px;line-height:110px;font-weight:normal;color:#e0e0e0;}
.extended-block.active .order {color:#ffd64f;}
.extended-block-text .text {width:450px;height:110px;overflow:hidden;}
.extended-block-text h3 {font-size:18px;line-height:18px;color:#498dd0;margin:8px 0;}
.extended-block-text h3 {font-size:18px;line-height:18px;color:#498dd0;margin:8px 0;font-family:"MyriadProRegular";font-weight: normal;}
.extended-block-text p {font-size:14px;line-height:14px;margin:4px 0;}
.extended-block-more {font-size:13px;line-height:13px;margin:0;background:url(../img/darker-bg.png);position:absolute;left:600px;top:0;width:423px;height:100%;box-sizing:border-box;padding:20px;}
.extended-block-more .text {padding:20px;overflow:hidden;height:100%;position:relative;background:#fff;box-sizing:border-box;}
.extended-block-more {height:auto;background:#fff;box-shadow: 0 0 5px #ddd;border-radius:5px;font-size:13px;line-height:13px;margin:0;position:absolute;left:600px;top:0;width:550px;height:100%;box-sizing:border-box;padding:20px;}
.extended-block-more .text {overflow:hidden;height:100%;position:relative;box-sizing:border-box;}
.extended-block-more .text p {margin:0;}
.extended-triangle {background: url(../img/triangle.png) no-repeat center center;width:26px;height:29px;position:relative;left:574px;top:40px;}
.extended-triangle {background: url(../img/triangle.png) no-repeat center center;width:9px;height:41px;position:relative;left:600px;top:40px;z-index:1;}
#index-yellow-banner {background:url(../img/index-yellow-bg.jpg)#fed13e;height:190px;width:100%;position:absolute;bottom:100px;z-index:5;}
#index-yellow-banner {background:url(../img/index-yellow-bg.jpg)#fed13e;height:190px;width:100%;bottom:100px;z-index:5;margin-top: -60px;}
#index-yellow-banner .w1200{height:100%;}
#index-yellow-banner .lamp {background:url(../img/lamp.png) no-repeat center center;height:180px;width:160px;}
#index-yellow-banner .lamp {background:url(../img/lamp-off.png) no-repeat center center;height:180px;width:160px;}
#index-yellow-banner .lamp:hover {background:url(../img/lamp.png) no-repeat center center;height:180px;width:160px;}
#index-yellow-banner .text {width:640px; margin-top: 10px;}
#index-yellow-banner .text a {font-size:24px;margin:0;font-family:"MyriadProRegular";display:inline-block;margin:25px 0 18px 0;color:#313942;text-decoration: none;}
#index-yellow-banner .text p {margin:0;font-size:15px;font-family:"Arial" sans-serif;color:#313942;}
#index-yellow-banner .btn {font-family:"MyriadProCondensed";width:400px;height:75px;margin-top:57px;font-weight:normal;}
#index-yellow-banner .btn a {width:400px;height:75px;background:#313942;display:table-cell;vertical-align:middle;text-align:center;text-transform:uppercase;text-decoration:none;color:#fff;font-size:28px;}
#index-yellow-banner .btn a:hover {width:400px;height:75px;background:#232e39;border:solid 3px #fff;display:table-cell;vertical-align:middle;text-align:center;text-transform:uppercase;text-decoration:none;color:#fff;font-size:28px;}
#index-yellow-banner .btn a:hover {width:400px;height:75px;background:#232e39;display:table-cell;vertical-align:middle;text-align:center;text-transform:uppercase;text-decoration:none;color:#fff;font-size:28px;}
.center-form-page {margin:64px auto;width:514px;padding:20px;background:#fff;box-shadow: 0 0 5px #ddd;}
.register-arrow {width:300px;height:100px;background:url(../img/black_arrow.png) no-repeat center center;position:absolute;left:50%;top:335px;margin-left:300px;color:#fff;padding: 20px 0 0 0;font-style:italic;text-align:center;font-size:16px;}
@ -138,6 +139,13 @@ body {
.register-form {margin:0 46px 64px 0;width:514px;padding:20px;background:#fff;box-shadow: 0 0 5px #ddd;float:left;}
.reset-form {margin: 0 46px 64px 0;width: 514px;padding: 20px;background: #fff;box-shadow: 0 0 5px #ddd;}
.reset-form .field label {display:inline-block;width:190px;text-align:right;line-height:50px;padding-right:5px;vertical-align:middle; font-size: 16px;}
.reset-form .field input[type="text"]{color: #959595;width: 300px;vertical-align: bottom;height: 40px;margin-top: 32px;font-size: 26px;}
.reset-form .buttons input[type="submit"]{background:#fed13e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;text-transform:uppercase;}
.reset-form .buttons input[type="submit"]:hover{background:#ffca3e;border:none;cursor:pointer;font-size:22px;padding:15px 40px;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;text-transform:uppercase;}
.reset-form .buttons {text-align:center; margin-top: 20px;}
.register_desc h2 {margin:0;}
#why_register {margin-bottom:260px;position:relative;}
#prices-block {overflow:hidden;width:100%;height:146px;margin-top:20px;}
@ -204,12 +212,12 @@ body {
padding:5px 5px 0 0;
}
.price-block .price-discount span{
font-size:18px;
font-size:14px;
font-family:'MyriadProRegular';
font-weight:bold;
display:block;
height:18px;
line-height:18px;
height:10px;
line-height:14px;
width:54px;
padding:0;
margin:0;
@ -226,7 +234,7 @@ a { color: #498dd0; cursor: pointer; text-decoration: underline; }
a img { outline: none; border: 0; }
h1, h2, h3 { line-height: normal; }
h1 {font-family:"Arial Narrow", Arial, sans-serif;font-size:30px;font-weight:normal;font-stretch:condensed;}
h1 {font-family:"MyriadPro-Light", Arial ТNarrow, sans-serif;font-size:30px;font-weight:normal;font-stretch:condensed;}
h2 {font-weight: normal;font-size:24px;font-family:"Arial Narrow", Arial, sans-serif;}
@ -377,7 +385,7 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; }
.add-link, .add-row {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;}
.add-link, .add-row:hover {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;}
.add-client-link {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;}
.add-client-link:hover {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;}
.add-client-link:hover {background: url(../img/icon-add.png) no-repeat right;}
.add-row {margin-top:4px;}
.edit-link a, .delete-link a { text-decoration: none; }
@ -562,7 +570,7 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; }
.w200 {width:200px;min-height:5px;}
.header {font-weight:bold;}
#footer {background:url('../img/footer-bg.jpg')#38424c;height:100px;position: absolute; bottom: 0px; width:100%;z-index:10;}
#footer {background:url('../img/footer-bg.jpg')#38424c;height:100px;bottom: 0px; width:100%;z-index:10;}
#footer-content {width:1200px;margin:0 auto;}
#footer-content a {margin-right: 15px;text-decoration: none;color:#607c99;}
#footer-content a:hover {margin-right: 15px;text-decoration: none;color:#4d94bd;}
@ -645,6 +653,7 @@ tr.doc-row:hover {cursor:pointer;}
.license-form .field.orange_border {border: solid 1px #fed13e;position:relative;}
.license-form .field.grey_border {border: solid 1px #9d9d9d;border-top:none;background:#faf9f9;position:relative;}
.license-form input[type=submit]{border:none;background:url(../img/gotopay.png)center center no-repeat;width:145px;height:145px;margin:0 auto; display:block;}
.license-form input[type=submit:hover]{border:none;background:url(../img/gotopay-hover.png)center center no-repeat;width:145px;height:145px;margin:0 auto; display:block;}
.orange-bottom-triangle {width:100%;height:20px;background:url(../img/triangle-orange-bottom.png)center center no-repeat;margin-top:-1px;position:absolute;top:0;left:0;}
.grey-bottom-triangle {width:100%;height:20px;background:url(../img/triangle-grey-bottom.png)center center no-repeat;margin-top:-1px;position:relative;}
.license-ways {width:585px;}

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

@ -14,6 +14,34 @@
</head>
<body>
<!-- Yandex.Metrika counter -->
<script type="text/javascript">
(function (d, w, c) {
(w[c] = w[c] || []).push(function() {
try {
w.yaCounter38822320 = new Ya.Metrika({
id:38822320,
clickmap:true,
trackLinks:true,
accurateTrackBounce:true
});
} catch(e) { }
});
var n = d.getElementsByTagName("script")[0],
s = d.createElement("script"),
f = function () { n.parentNode.insertBefore(s, n); };
s.type = "text/javascript";
s.async = true;
s.src = "https://mc.yandex.ru/metrika/watch.js";
if (w.opera == "[object Opera]") {
d.addEventListener("DOMContentLoaded", f, false);
} else { f(); }
})(document, window, "yandex_metrika_callbacks");
</script>
<noscript><div><img src="https://mc.yandex.ru/watch/38822320" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->
{% cms_toolbar %}
{% if license_15days %}
<div id="content" class="clear">
@ -74,9 +102,10 @@
<div id='footer'>
<div id="footer-content">
<div class="footer-text">Техподдержка Документора</div>
<a href='/'>help@documentor.ru</a>
<a href='mailto:help@dokumentor.ru'>help@dokumentor.ru</a>
<a href="/" onclick="return show_req_avail_form('{% url 'callback-send-message' %}');">Обратная связь</a>
<a href="/">Лицензионный договор</a>
<a href="{{ STATIC_URL }}dogovor.pdf">Лицензионное соглашение</a>
<a href="{{ STATIC_URL }}PD.pdf">Политика в отношении персональных данных</a>
</div>
</div>

@ -22,21 +22,21 @@
<div class='price-header'>6 месяцев</div>
<div class='price-content'>1000 р.
<div class='price-triangle'></div>
<div class='price-discount'><span>-10</span><span>%</span></div>
<div class='price-discount'><span>-200</span><span>р</span></div>
</div>
</div>
<div class='price-block'>
<div class='price-header'>1 год</div>
<div class='price-content'>1800 р.
<div class='price-triangle'></div>
<div class='price-discount'><span>-20</span><span>%</span></div>
<div class='price-discount'><span>-600</span><span>р</span></div>
</div>
</div>
<div class='price-block'>
<div class='price-header'>2 года</div>
<div class='price-content'>3000 р.
<div class='price-triangle'></div>
<div class='price-discount'><span>-30</span><span>%</span></div>
<div class='price-discount'><span>-1800</span><span>р</span></div>
</div>
</div>
</div>

@ -28,5 +28,6 @@
<div class="buttons">
<input type="submit" value="Зарегистрироваться" />
</div>
<p style="text-align:center;">Регистрируясь, я соглашаюсь на обработку моих <a href="https://dokumentor.ru/s/PD.pdf">персональных данных</a></p>
</form>
</div>

@ -14,7 +14,7 @@
<div id="{{ field.name }}" class="field">
{% if field.label %}
{{ field.label_tag }}
<div class="clear"></div>
{% endif %}
{{ field }}

@ -26,7 +26,7 @@
</div>
<div class='left text'>
<h2>Регистрируетесь</h2>
<p>Заполняете данные о своей компании, логин и пароль для входа в систему</p>
<p>Укажите свои реквизиты 1 раз и они будут автоматически вставляться в ваши документы</p>
</div>
</div>
<div class="index-promo-text">
@ -34,24 +34,21 @@
</div>
<div class='left text'>
<h2>Создаёте</h2>
<p>Документы по всем нормам и правилам документооборота РФ</p>
<p>Добавьте в систему своих контрагентов и сможете делать им все документы за секунды</p>
</div>
</div>
<div class="index-promo-text">
<div class='round round3'>
</div>
<div class='left text'>
<h2>Используете</h2>
<p>Возможности сервиса для хранения, отправки и редактирования документов</p>
<h2>Получаете</h2>
<p>Удобное хранение и контроль всех документов здесь, или можете скачать их к себе</p>
</div>
</div>
</div>
<div class="clear"></div>
<h2>Почему Документор?</h2>
<div id="reasons">
{% placeholder "reasons" %}
</div>
{% endblock %}
{% block bottom_wide %}
<div id='index-yellow-banner'>

Loading…
Cancel
Save