diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-07-22 13:16:01 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-07-23 18:36:45 +0200 |
| commit | 38bfae57fe40f0572656e17af9cab624295df5ce (patch) | |
| tree | bd6499210ecb416e52b961b38e5ad3a382d4e8a3 /core | |
| parent | fd4638c2299ce2dfbccfd3d5d4d5b0f280283ba5 (diff) | |
| download | nextcloud-server-38bfae57fe40f0572656e17af9cab624295df5ce.tar.gz nextcloud-server-38bfae57fe40f0572656e17af9cab624295df5ce.zip | |
sticky footer
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 22 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 14 |
2 files changed, 26 insertions, 10 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 528d45ff9bd..6c13823c444 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -3,7 +3,8 @@ See the COPYING-README file. */ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; } -html, body { min-height:100%; overflow:auto; } +html { height:100%; } +body { height:100%; background-attachment:fixed !important; } article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; } body { line-height:1.5; } table { border-collapse:separate; border-spacing:0; white-space:nowrap; } @@ -171,11 +172,14 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b /* LOG IN & INSTALLATION ------------------------------------------------------------ */ +#body-login #header { + padding-top: 100px; +} #body-login div.buttons { text-align:center; } #body-login p.info { width: 22em; text-align: center; - margin: 55px auto; + margin: 0 auto; color: #030303; text-shadow: #3d4d64 0 1px 0; } @@ -185,9 +189,6 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b } #body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */ -#body-login { - margin-top: 100px; -} #body-login form { width:22em; margin:2em auto 2em; padding:0; } #body-login form fieldset { margin-bottom: 20px; @@ -319,6 +320,17 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac #alternative-logins legend { margin-bottom:10px; } #alternative-logins li { height:40px; display:inline-block; white-space:nowrap; } +/* Sticky footer */ +#body-login .wrapper { + min-height: 100%; + margin: 0 auto -50px; +} +#body-login footer, #body-login .push { + height: 50px; +} + + + /* NAVIGATION ------------------------------------------------------------- */ #navigation { diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 29e1debdfdb..f49d8ee215f 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -35,12 +35,16 @@ </head> <body id="body-login"> - <header><div id="header"> - <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" /> - <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> - </div></header> + <div class="wrapper"><!-- for sticky footer --> + <header><div id="header"> + <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" /> + <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> + </div></header> - <?php print_unescaped($_['content']); ?> + <?php print_unescaped($_['content']); ?> + + <div class="push"></div><!-- for sticky footer --> + </div> <footer> <p class="info"> |