diff options
| author | Henry Jameson <me@hjkos.com> | 2018-12-18 22:43:26 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-12-18 22:43:26 +0300 |
| commit | 81c83566cd8a9bf09b568264e289591c52fbca0d (patch) | |
| tree | 327b6e195cb9820213dd838384353beb22e99f6b /src/App.vue | |
| parent | 485a531d57108f8adf57ae5043610ef107b26d3e (diff) | |
| parent | f62ff2d894d87c7e9c200687eb2a91bcb111e7e1 (diff) | |
Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
* upstream/develop: (24 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
Make user profile page cleaner
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Implement user_profile.spec.js
Use babel polyfill in karma
Use 'userProfileLink' to generate user-profile link
Rollback disableDotRule
Use "-1" in indexOf
Add generateProfileLink
Use "~" as a route namespace symbol
Disable dot rule
Pass userName instead of userId
Typo in tests
Fix redirect paths
Fix typo
...
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/App.vue b/src/App.vue index a3a7ecf6..4d4680e2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ <template> <div id="app" v-bind:style="style"> - <nav class='container' @click="scrollToTop()" id="nav"> + <nav class='nav-bar container' @click="scrollToTop()" id="nav"> <div class='logo' :style='logoBgStyle'> <div class='mask' :style='logoMaskStyle'></div> <img :src='logo' :style='logoStyle'> @@ -13,9 +13,9 @@ <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link> </div> <div class='item right'> - <user-finder class="nav-icon" @toggled="onFinderToggled"></user-finder> - <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon" :title="$t('nav.preferences')"></i></router-link> - <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout nav-icon" :title="$t('login.logout')"></i></a> + <user-finder class="button-icon nav-icon" @toggled="onFinderToggled"></user-finder> + <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="button-icon icon-cog nav-icon" :title="$t('nav.preferences')"></i></router-link> + <a href="#" v-if="currentUser" @click.prevent="logout"><i class="button-icon icon-logout nav-icon" :title="$t('login.logout')"></i></a> </div> </div> </nav> |