remotes/origin/yandex
Bachurin Sergey 11 years ago
parent a345962f5e
commit 6a8f1a0a91
  1. 14
      project/static/css/style.css
  2. BIN
      project/static/img/left-arrow.png
  3. BIN
      project/static/img/sign-email.png
  4. 3
      project/static/js/commons.js
  5. 2
      project/static/js/docs/list.panels.js
  6. 2
      project/templates/docs/_base/base_list.html
  7. 6
      project/templates/menu/menu.html

@ -325,7 +325,7 @@ input[type=text], input[type=number], input[type=email], input[type=password], t
.client-form .bank-header {color:#646669;font-weight:bold;text-align:center;margin:15px 0;}
/*.client-form .buttons { padding: 10px 0 6px 33px; }*/
.profile-table {width:100%;overflow:hidden;border-collapse: separate; display:table;border-spacing:15px;background:url(../img/darker-bg.png);padding-bottom:85px;}
.profile-table {width:100%;overflow:hidden;border-collapse: separate; display:table;border-spacing:15px;background:url(../img/darker-bg.png);margin-bottom:85px;}
.profile-row {display:table-row;}
.profile-col1 {width: 785px;margin-right:15px;}
.profile-col2 {width: 370px;}
@ -372,7 +372,8 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; }
.doc-panel a.email-link {background:url(../img/sign-email.png)left center no-repeat;}
.doc-panel a.edit-link {background:url(../img/sign-edit.png)left center no-repeat;}
.doc-panel a.delete-link {background:url(../img/icon-delete.png)7px center no-repeat;}
.doc-panel .doc-panel-header {background:#f7f7f7;padding:10px 18px;font-size:16px;}
.doc-panel .doc-panel-header {background:#f7f7f7;padding:5px 18px;font-size:16px;}
.doc-panel .doc-panel-header:first-child {border-bottom:1px solid #dedede;}
.preview-col2 .doc-panel {box-sizing:border-box;}
a.delete { vertical-align: top; }
@ -504,7 +505,8 @@ a.delete { vertical-align: top; }
.docs-content-wrapper {border:#dedede 1px solid;border-bottom:none;overflow: hidden;position:relative;}
.docs-content-wrapper table.list {border:none;}
table.list {border-collapse: collapse;border:#dedede 1px solid;border-bottom:none;width: 100%;}
table.list tr:nth-child(odd) {background: #f7f7f7;}
.docs-content-wrapper table.list tr.doc-row {height:50px;}
table.list tr:nth-child(even) {background: #f7f7f7;}
table.list tr th {text-align: left;font-size:12px;color:#646669;padding:7px 10px 7px 10px;border-right:#dedede 1px solid;border-bottom:#dedede 1px solid;border-top:none;background: #f7f7f7;}
table.list tr th:last-child {border-right:none;}
table.list tr th a {font-size:12px;color:#646669;text-decoration:none;}
@ -546,8 +548,10 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; }
#menu ul li span{color:#fed13e;}
#menu ul li.selected{background:url('../img/menu-selected.png') #313942 no-repeat bottom center; }
#menu ul li.selected a{color:#fed13e;}
#menu .other_docs_menu {position:absolute;top:50px;z-index:50;}
#menu .other_docs_menu li {display:block;}
#menu .other_docs_menu {position:absolute;top:50px;z-index:50;border:1px #51575f solid;}
#menu .other_docs_menu li {display:block;padding:0;background:#454c54;border-top:1px solid #363b43;}
#menu .other_docs_menu li:first-child {border-top:none;}
#menu .other_docs_menu li a {line-height:50px;padding-left:10px;display:inline-block;width:100%;}
.preview-wrapper {width:1200px;background:url(../img/darker-bg.png);margin-bottom:70px;}
.preview {width:785px;height:500px;overflow:scroll;float:left;margin:15px 0 15px 15px;}

Binary file not shown.

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 756 B

@ -29,6 +29,9 @@ $(document).ready(function() {
});
$('#other_docs').mouseover(function(e){
$('.other_docs_menu').show();
var other_width = $('#other_docs').width();
console.log(other_width);
$('.other_docs_menu').css({width: other_width});
});
$('.other_docs_menu').mouseout(function(e){
$('.other_docs_menu').hide();

@ -26,7 +26,7 @@ $(document).ready(function() {
// show only specifil panel and show and adjust pointer coords, and hide filters
doc_rows.mouseenter(function() {
var row = $(this);
var row_vertical_shift = 8; // predefined const: depends on tr top/bottom paddings
var row_vertical_shift = -30; // predefined const: depends on tr top/bottom paddings
var row_pos = row.position();
row_pointer.css({

@ -81,7 +81,7 @@
</div>
<div id="row_pointer" style="display: none; float: left;">
<img src="{{ STATIC_URL }}img/left-arrow.gif" />
<img src="{{ STATIC_URL }}img/left-arrow.png" />
</div>
<div class="list-col2">

@ -46,13 +46,13 @@
{% else %}
<ul class="other_docs_menu hidden">
<li class="child{% if request.path == url_aktsverki_list %} selected{% endif %}">
<a href="{{ url_aktsverki_list }}">АКТЫ СВЕРКИ</a>
<a href="{{ url_aktsverki_list }}">Акты сверки</a>
</li>
<li class="child{% if request.path == url_dover_list %} selected{% endif %}">
<a href="{{ url_dover_list }}">ДОВЕРЕННОСТИ</a>
<a href="{{ url_dover_list }}">Доверенности</a>
</li>
<li class="child{% if request.path == url_platejka_list %} selected{% endif %}">
<a href="{{ url_platejka_list }}">ПЛАТЁЖНЫЕ ПОРУЧЕНИЯ</a>
<a href="{{ url_platejka_list }}">Платёжные поручения</a>
</li>
</ul>
{% endif %}

Loading…
Cancel
Save