diff options
-rw-r--r-- | css/content.css | 13 | ||||
-rw-r--r-- | templates/main.php | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/css/content.css b/css/content.css index 27274822a..037a923f7 100644 --- a/css/content.css +++ b/css/content.css @@ -23,13 +23,18 @@ vertical-align: middle; } -#app-content:after { +#content-container { + min-width: 100%; + min-height: 100%; +} + +#content-container:after { content: ''; display: block; height: 100%; } -#app-content.autopaging:after { +#content-container.autopaging:after { content: ''; background-image: url('../img/loading.gif'); background-position: center; @@ -40,11 +45,13 @@ } -#app-content.icon-loading > * { +#content-container.icon-loading > * { display: none; } + + /** * Rules for a single feed item */ diff --git a/templates/main.php b/templates/main.php index 9185eb2f7..e879c8a18 100644 --- a/templates/main.php +++ b/templates/main.php @@ -42,7 +42,9 @@ <!-- content --> <script type="text/ng-template" id="content.html"><?php print_unescaped($this->inc('part.content')) ?></script> - <div id="app-content" + <div id="app-content"></div> + <div + id="content-container" ng-class="{ 'icon-loading': App.loading.isLoading('content'), 'autopaging': App.loading.isLoading('autopaging') @@ -54,6 +56,7 @@ news-scroll-enabled-auto-page="Content.autoPagingEnabled()" news-scroll-enabled-mark-read="Content.markReadEnabled()" news-scroll-auto-page="Content.autoPage()" - news-scroll-mark-read="Content.scrollRead(itemIds)"></div> + news-scroll-mark-read="Content.scrollRead(itemIds)"> + </div> </div> |