composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2847 - Rework iTopWebPage layout (WIP Part X)

Browse Source 
- iTopWebPage: Remove AddToMenu() method
- SCSS: Fix content areas height to occupy max. available space
This commit is contained in:
Molkobain
2020-08-05 15:58:39 +02:00
parent c81f521d2e
commit 470b566c1a
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/itopwebpage.class.inc.php
View File

@@ -83,7 +83,6 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
utils::InitArchiveMode();
$this->m_sMenu = "";
$this->m_aMessages = array();
$this->SetRootUrl(utils::GetAbsoluteUrlAppRoot());
$this->add_header("Content-type: text/html; charset=".self::PAGES_CHARSET);
@@ -687,15 +686,6 @@ JS
$this->sBreadCrumbEntryIcon = null;
}
/**
* @param string $sHtml
* @deprecated Will be removed in 2.8.0
*/
public function AddToMenu($sHtml)
{
$this->m_sMenu .= $sHtml;
}
/**
* @return string
* @throws \CoreException

22
css/backoffice/pages/_base.scss
View File

@@ -21,8 +21,8 @@ $ibo-body-text-color: $ibo-color-grey-900 !default;
$ibo-body-background-color: $ibo-color-white-200 !default;
$ibo-page-container--elements-padding-x: 48px !default;
$ibo-page-content--padding-top: 24px !default;
$ibo-page-content--padding-bottom: 24px !default;
$ibo-main-content--padding-top: 24px !default;
$ibo-main-content--padding-bottom: 24px !default;
/* CSS variables (can be changed directly from the browser) */
:root{
@@ -47,12 +47,18 @@ body{
#ibo-page-container{
position: relative; /* To avoid having its descendants with "z-index" over siblings of self */
z-index: 10;
/* Self */
height: 100%;
overflow: auto;
flex-grow: 1;
/* For children */
display: flex;
flex-direction: column;
#ibo-top-bar,
#ibo-page-content{
#ibo-main-content{
/* Align both elements content for a slicker touch */
padding-left: $ibo-page-container--elements-padding-x;
padding-right: $ibo-page-container--elements-padding-x;
@@ -64,10 +70,14 @@ body{
left: 0;
right: 0;
}
#ibo-page-content{
#ibo-center-container{
position: relative; /* To avoid having its descendants with "z-index" over siblings of self */
z-index: 10;
padding-top: $ibo-page-content--padding-top;
padding-bottom: $ibo-page-content--padding-bottom;
flex-grow: 1; /* To occupy all height available */
}
#ibo-main-content{
padding-top: $ibo-main-content--padding-top;
padding-bottom: $ibo-main-content--padding-bottom;
}
}