diff options
| author | Zephyrrus <[email protected]> | 2020-07-19 22:35:59 +0300 |
|---|---|---|
| committer | Zephyrrus <[email protected]> | 2020-07-19 22:35:59 +0300 |
| commit | 645b62b81dc46b2e2bdea0fbe30c36c4e0ff4a48 (patch) | |
| tree | 4c454e816b699ead53d225afadfb528649d126f7 /src/site/components | |
| parent | feat: Start working on a new album/tags/image info modal (diff) | |
| parent | Update setup script (diff) | |
| download | host.fuwn.me-645b62b81dc46b2e2bdea0fbe30c36c4e0ff4a48.tar.xz host.fuwn.me-645b62b81dc46b2e2bdea0fbe30c36c4e0ff4a48.zip | |
Merge branch 'dev' into dev-zephy
Diffstat (limited to 'src/site/components')
| -rw-r--r-- | src/site/components/grid/Grid.vue | 6 | ||||
| -rw-r--r-- | src/site/components/navbar/Navbar.vue | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/site/components/grid/Grid.vue b/src/site/components/grid/Grid.vue index 1b62097..1e427fc 100644 --- a/src/site/components/grid/Grid.vue +++ b/src/site/components/grid/Grid.vue @@ -152,6 +152,12 @@ </div> </template> </b-table> + <button + v-if="moreFiles" + class="button is-primary mt2" + @click="loadMoreFiles"> + Load more + </button> </div> <b-modal :active.sync="isAlbumsModalActive" scroll="keep"> <ImageInfo :file="modalData.file" /> diff --git a/src/site/components/navbar/Navbar.vue b/src/site/components/navbar/Navbar.vue index fb78631..0f82200 100644 --- a/src/site/components/navbar/Navbar.vue +++ b/src/site/components/navbar/Navbar.vue @@ -45,11 +45,12 @@ </router-link> </b-navbar-item> <b-navbar-item tag="div"> - <a - class="navbar-item" - @click="logOut"> + <router-link + to="/" + class="navbar-item no-active" + @click.native="logOut"> Logout - </a> + </router-link> </b-navbar-item> </template> <template v-else> |