diff --git a/static/aerbimCSS.css b/static/aerbimCSS.css index 51a4acd..df40093 100644 --- a/static/aerbimCSS.css +++ b/static/aerbimCSS.css @@ -1656,6 +1656,8 @@ body.n_scroll{ font-size: 14px; color: #7A8185FF; cursor: pointer; + display: block; + text-decoration: unset; } .way_bread_crumb.last{ @@ -1730,6 +1732,7 @@ body.n_scroll{ display: flex; align-items: center; justify-content: center; + text-decoration: unset; } .one_item_documentation_switcher_content_part:hover{ @@ -1744,7 +1747,7 @@ body.n_scroll{ .tree_documentation_container{ width: 100%; - height: calc(100vh - 245px); + height: calc(100vh - 300px); overflow-y: auto; } .tree_documentation_container.hide_scroll::-webkit-scrollbar{ @@ -1822,12 +1825,16 @@ body.n_scroll{ font-weight: 700; color: #000000; margin-left: 3px; + display: block; + text-decoration: unset; } .tree_documentation_container_second_level_txt{ font-size: 16px; font-weight: 400; color: #000000; margin-left: 3px; + display: block; + text-decoration: unset; } .tree_documentation_container_first_level_txt.chose{ color: #0C54A0FF; @@ -1867,6 +1874,8 @@ body.n_scroll{ font-weight: 400; margin: 5px 0; cursor: pointer; + display: block; + text-decoration: unset; } .element_third_level_content_part_tree.chose{ @@ -1947,6 +1956,8 @@ body.n_scroll{ font-weight: 400; color: #7A8185FF; border-bottom: 1px solid #7A8185FF; + display: block; + text-decoration: unset; } .control_content_part_tree_el.right .txt_control_content_part_tree_el{ margin-right: 7px; @@ -1991,6 +2002,12 @@ body.n_scroll{ align-items: center; justify-content: right; width: 100%; + float: right; + position: sticky; + top: 61px; + background: #FFFFFF; + padding: 22px 22px; + z-index: 10000; } .container_open_doc_curtain_txt{ diff --git a/static/aerbimCSSMOBILE.css b/static/aerbimCSSMOBILE.css index 77bb498..6d3ceec 100644 --- a/static/aerbimCSSMOBILE.css +++ b/static/aerbimCSSMOBILE.css @@ -61,6 +61,7 @@ } .breadcrumbs_documentation_block{ margin-top: 90px; + margin-bottom: 2px; } .container_img_card_contacts{ height: 250px; diff --git a/static/aerbimJS.js b/static/aerbimJS.js index e21f6ea..44bbbcb 100644 --- a/static/aerbimJS.js +++ b/static/aerbimJS.js @@ -55,7 +55,7 @@ function setButtonOpenMobileDocCurtain () { $picture.appendChild($img) - $($cont).insertBefore($content) + $($cont).insertAfter($(".breadcrumbs_documentation_block")) } function setInfInCurtainDocumentationMobile () { @@ -595,17 +595,20 @@ $(window).scroll(function (){ maxScroll = $(".documentation_block")[0].getBoundingClientRect().bottom - $(".left_curtain_documentation")[0].offsetHeight - 172 } let $new_curtain = $($curtain[1]) + if (scroll < maxScroll || !maxScroll){ if (!$curtain[1] && waitingTop){ $new_curtain = $curtain.clone() $new_curtain.insertAfter($curtain) + let $new_curtain_tree = $new_curtain.find(".tree_documentation_container") + $new_curtain_tree.css({height: 'calc(100vh - 245px);'}) } if (scroll >= waitingTop && waitingTop){ $new_curtain.css({position:'fixed',top: 166,bottom:"unset"}) - $($curtain[0]).css({opacity:0}) + $($curtain[0]).css({opacity:0,display: 'none'}) } else if (scroll < waitingTop && waitingTop) { $new_curtain.remove() - $($curtain[0]).css({opacity:1}) + $($curtain[0]).css({opacity:1,'display':'block'}) } else if (!waitingTop){ waitingTop = $(".left_curtain_documentation")[0].getBoundingClientRect().top - 172 maxScroll = $(".documentation_block")[0].getBoundingClientRect().bottom - $(".left_curtain_documentation")[0].offsetHeight - 172 @@ -614,6 +617,8 @@ $(window).scroll(function (){ if (!$curtain[1]){ $new_curtain = $curtain.clone() $new_curtain.insertAfter($curtain) + let $new_curtain_tree = $new_curtain.find(".tree_documentation_container") + $new_curtain_tree.css({height: 'calc(100vh - 245px);'}) } $new_curtain.css({position:'absolute',bottom: 0,top: 'unset'}) $($curtain[0]).css({opacity:0}) diff --git a/templates/pages/p_documentation.html b/templates/pages/p_documentation.html index 53a0316..d821879 100644 --- a/templates/pages/p_documentation.html +++ b/templates/pages/p_documentation.html @@ -25,9 +25,9 @@ {# Документация для версии 1#} {# #} {% for name,url in breadcrumbs.items %} -
+ {% if not forloop.last %}