Fixed merge conflicts.

This commit is contained in:
Konstantin Obenland 2015-01-14 09:35:02 -08:00
commit ec2a5e212a
15 changed files with 87 additions and 121 deletions

View file

@ -1,6 +1,6 @@
/* Globally hidden elements when Infinite Scroll is supported and in use. */
.infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden). */
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling). */
.infinite-scroll .posts-navigation, /* Older / Newer Posts Navigation (always hidden) */
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
display: none;
}