diff --git a/assets/css/main.css b/assets/css/main.css index f91654b..3432931 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -4202,8 +4202,7 @@ body.organization-view #details .grid-2>div>.contacts{margin-top:0} .okb-structure-view .structure-viewport{background:#2b2b2b;background-image:none} .okb-structure-view .structure-legend, .okb-structure-view .structure-controls, -.okb-structure-view .structure-hint, -.okb-structure-view .structure-static-footer{display:none} +.okb-structure-view .structure-hint{display:none} .okb-structure-image{ display:block; width:1920px; @@ -4241,10 +4240,6 @@ body.organization-view #details .grid-2>div>.contacts{margin-top:0} .structure-stage>[hidden]{display:none!important} .structure-stage-view[hidden]{display:none!important} -/* У ОКБ МЭИ схема показывается на нейтральном фоне интерфейса, без синей подложки. */ -.okb-structure-view .structure-page, -.okb-structure-view .structure-viewport{background-image:none} - /* Открытие графика не должно скрывать вкладку исходной организации. */ .uaz-structure-view .topbar .tab[data-page="uly-uaz"], .saturn-structure-view .topbar .tab[data-page="saturn"], @@ -4418,6 +4413,22 @@ button.saturn-flow-node-source:hover,button.saturn-flow-node-source:focus-visibl max-height:none; overflow:visible; } + + body.organization-view:not(.expanded) #content:has(>#legal):has(>#about)>#legal, + body.organization-view:not(.expanded) #content:has(>#legal):has(>#about)>#about{ + align-self:stretch; + display:flex; + flex-direction:column; + } + + body.organization-view:not(.expanded) #content:has(>#legal):has(>#about) #legal .legal-short, + body.organization-view:not(.expanded) #content:has(>#legal):has(>#about) #about .summary{ + flex:1 1 auto; + } + + body.organization-view:not(.expanded) #content:has(>#legal):has(>#about) #legal .legal-short{ + margin-top:0; + } } @media(max-width:48rem){ .source-details-list>div{grid-template-columns:1fr;gap:.25rem} diff --git a/assets/js/app.js b/assets/js/app.js index fc04792..c334aa7 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -2257,7 +2257,9 @@ function fitStructure(){ if(!width||!height)return; const fullCanvasStructure=document.body.classList.contains('saturn-structure-view')||document.body.classList.contains('okb-structure-view'); const canvasHeight=fullCanvasStructure?1080:972; - const availableHeight=Math.max(320,height-(fullCanvasStructure?0:40)); + const structureFooter=document.querySelector('.structure-static-footer'); + const footerHeight=structureFooter&&getComputedStyle(structureFooter).display!=='none'?structureFooter.offsetHeight:0; + const availableHeight=Math.max(320,height-footerHeight); structureState.scale=clampStructureScale(Math.min(width/1920,availableHeight/canvasHeight)); structureState.x=(width-1920*structureState.scale)/2; structureState.y=document.body.classList.contains('uaz-structure-view')