diff options
| author | Hendrik Leppelsack <hendrik@leppelsack.de> | 2015-10-09 17:32:26 +0300 |
|---|---|---|
| committer | Hendrik Leppelsack <hendrik@leppelsack.de> | 2015-10-09 17:32:26 +0300 |
| commit | 8257c7fd2ef111a322bec7691a3826338475f475 (patch) | |
| tree | 66555702b4d8c0f7923e0ee18616262ffc075f90 | |
| parent | a04c40fecefa9eec4ea3da697ef56d79e55b5887 (diff) | |
adjust footer in public view
| -rw-r--r-- | css/public.css | 2 | ||||
| -rw-r--r-- | js/app.js | 4 | ||||
| -rw-r--r-- | js/gallery.js | 8 | ||||
| -rw-r--r-- | templates/public.php | 6 |
4 files changed, 5 insertions, 15 deletions
diff --git a/css/public.css b/css/public.css index de636c01..448b1f4d 100644 --- a/css/public.css +++ b/css/public.css @@ -6,6 +6,8 @@ body { #content { height: initial; + min-height: calc( 100vh - 120px ); + overflow: hidden; } /* within #save */ @@ -16,9 +16,6 @@ $(document).ready(function () { Gallery.utility.showIeWarning(Gallery.ieVersion); } - // Needed to centre the spinner in some browsers - Gallery.resetContentHeight(); - // Get the config, the files and initialise the slideshow Gallery.showLoading(); $.getJSON(Gallery.utility.buildGalleryUrl('config', '', {})) @@ -69,7 +66,6 @@ $(document).ready(function () { } // This makes sure dropdowns will not be hidden after a window resize if (windowHeight !== $(window).height()) { - Gallery.resetContentHeight(); infoContentContainer.css('max-height', $(window).height() - Gallery.browserToolbarHeight); diff --git a/js/gallery.js b/js/gallery.js index a1b2b676..266fc47c 100644 --- a/js/gallery.js +++ b/js/gallery.js @@ -306,14 +306,6 @@ }, /** - * Resets the height of the content div so that the spinner can be centred - */ - resetContentHeight: function () { - // 200 is the space required for the footer and the browser toolbar - $('#content').css("min-height", $(window).height() - 200); - }, - - /** * Creates a new slideshow using the images found in the current folder * * @param {Array} images diff --git a/templates/public.php b/templates/public.php index 4d611c6c..4c88f501 100644 --- a/templates/public.php +++ b/templates/public.php @@ -153,10 +153,10 @@ style( </div> <div id="emptycontent" class="hidden"></div> <div id="loading-indicator" class="loading"></div> - <footer> - <p class="info"><?php print_unescaped($theme->getLongFooter()); ?></p> - </footer> </div> </div> + <footer> + <p class="info"><?php print_unescaped($theme->getLongFooter()); ?></p> + </footer> </div> |