commit: 37f5e0d8b6230ccb4801b1ee0e185d64acc00348
parent: 5dca57cc058bfb95e40e32714057cbf0d24ce679
Author: lambda <pleromagit@rogerbraun.net>
Date: Wed, 8 Nov 2017 10:44:24 +0000
Merge branch 'fix/polish-user-finder-and-nav-buttons' into 'develop'
Fix/polish user finder and nav buttons
See merge request pleroma/pleroma-fe!132
Diffstat:
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/App.scss b/src/App.scss
@@ -69,6 +69,12 @@ button{
flex: 1;
line-height: 21px;
height: 21px;
+ overflow: hidden;
+
+ .nav-icon {
+ font-size: 1.1em;
+ margin-left: 0.4em;
+ }
}
.gaps > .item {
diff --git a/src/App.vue b/src/App.vue
@@ -6,9 +6,9 @@
<router-link :to="{ name: 'root'}">{{sitename}}</router-link>
</div>
<div class='item right'>
- <user-finder></user-finder>
- <router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link>
- <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout" title="Logout" ></i></a>
+ <user-finder class="nav-icon"></user-finder>
+ <router-link :to="{ name: 'settings'}"><i class="icon-cog nav-icon"></i></router-link>
+ <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout nav-icon" title="Logout" ></i></a>
</div>
</div>
</nav>
diff --git a/src/components/user_finder/user_finder.vue b/src/components/user_finder/user_finder.vue
@@ -1,14 +1,14 @@
<template>
- <span>
+ <span class="user-finder-container">
<span class="finder-error base05" v-if="error">
<i class="icon-cancel user-finder-icon" @click="dismissError"/>
Error fetching user
</span>
<i class="icon-spin4 user-finder-icon animate-spin-slow" v-if="loading" />
- <a href="#" v-if="hidden"><i class="icon-user-plus user-finder-icon" @click.prevent="toggleHidden"/></a>
+ <a href="#" v-if="hidden"><i class="icon-user-plus user-finder-icon" @click.prevent.stop="toggleHidden"/></a>
<span v-else>
<input class="user-finder-input base03-border" @keyup.enter="findUser(username)" v-model="username" placeholder="Find user" id="user-finder-input" type="text"/>
- <i class="icon-cancel user-finder-icon" @click="toggleHidden"/>
+ <i class="icon-cancel user-finder-icon" @click.prevent.stop="toggleHidden"/>
</span>
</span>
</template>
@@ -16,8 +16,12 @@
<script src="./user_finder.js"></script>
<style lang="scss">
+ .user-finder-container {
+ height: 21px;
+ max-width: 100%;
+ }
+
.user-finder-icon {
- margin-right: 0.25em;
}
.user-finder-input {
@@ -25,6 +29,7 @@
border-style: solid;
border-color: inherit;
border-radius: 5px;
+ max-width: 80%;
padding: 0.1em 0.2em 0.2em 0.2em;
}