diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/apps.scss | 7 | ||||
| -rw-r--r-- | core/templates/layout.base.php | 6 | ||||
| -rw-r--r-- | core/templates/layout.public.php | 8 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 6 |
4 files changed, 7 insertions, 20 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index d8b2def9e5f..f8cb96e0054 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -583,13 +583,6 @@ kbd { /* CONTENT --------------------------------------------------------- */ -#content-wrapper { - // everything not related to content but needs to be on the window - // goes here (popups, tooltips...) - position: relative; - min-height: 100%; - display: unset; -} #content { box-sizing: border-box; position: relative; diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 8bb8e8ba3ca..d38bd114c3e 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -18,10 +18,8 @@ </head> <body id="body-public"> <?php include 'layout.noscript.warning.php'; ?> - <div id="content-wrapper"> - <div id="content" class="app-public" role="main"> - <?php print_unescaped($_['content']); ?> - </div> + <div id="content" class="app-public" role="main"> + <?php print_unescaped($_['content']); ?> </div> </body> </html> diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php index afdd5656be4..07aff03127d 100644 --- a/core/templates/layout.public.php +++ b/core/templates/layout.public.php @@ -70,11 +70,9 @@ </div> <?php } ?> </header> - <div id="content-wrapper"> - <div id="content" class="app-<?php p($_['appid']) ?>" role="main"> - <?php print_unescaped($_['content']); ?> - </div> - </div + <div id="content" class="app-<?php p($_['appid']) ?>" role="main"> + <?php print_unescaped($_['content']); ?> + </div> <?php if($template->getFooterVisible()) { ?> <footer> <p class="info"><?php print_unescaped($theme->getLongFooter()); ?></p> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index fbd71ec825b..32385c37aea 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -159,10 +159,8 @@ <input class="confirm" value="<?php p($l->t('Confirm')); ?>" type="submit"> </form> - <div id="content-wrapper"> - <div id="content" class="app-<?php p($_['appid']) ?>" role="main"> - <?php print_unescaped($_['content']); ?> - </div> + <div id="content" class="app-<?php p($_['appid']) ?>" role="main"> + <?php print_unescaped($_['content']); ?> </div> </body> |