Skip to content

Commit

Permalink
closes #526 and #687
Browse files Browse the repository at this point in the history
changed the add account icon, removed delay from tooltips, removed session min-height for tighter boxes, improved styling on user profile page, made toolbar more consistent
  • Loading branch information
jbibla committed May 14, 2018
1 parent bf445bb commit 95e3cb3
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
1 change: 0 additions & 1 deletion app/src/renderer/components/common/NiSession.vue
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ export default {
&:not(.ni-form)
&.ni-form .ni-form-main
width 32rem
min-height 28rem
max-height 100vh
height auto
Expand Down
2 changes: 1 addition & 1 deletion app/src/renderer/components/common/NiSessionWelcome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
subtitle="If you have an account, choose this option.")
li-session(
@click.native="setState('sign-up')"
icon="create"
icon="person_add"
title="Create new account"
subtitle="Generate a brand new seed and create a new account.")
li-session(
Expand Down
2 changes: 1 addition & 1 deletion app/src/renderer/components/common/NiToolBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
i.material-icons arrow_back
a.help(@click="enableModalHelp" v-tooltip.bottom="'Help'")
i.material-icons help_outline
a.sign-out(@click="signOut" v-tooltip.bottom.end="'Sign Out'")
a.sign-out(@click="signOut" v-tooltip.bottom.end="'Sign Out'")
i.material-icons exit_to_app
</template>

Expand Down
6 changes: 5 additions & 1 deletion app/src/renderer/components/common/PageProfile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ page(title="My Profile")
:checked="onboarding.active"
@change="setOnboarding")

.ni-session-footer
.sign-out-container
btn(icon='exit_to_app' type='button' @click.native="signOut" value='Sign Out')
</template>

Expand Down Expand Up @@ -70,3 +70,7 @@ export default {
}
}
</script>
<style lang="stylus">
.sign-out-container
padding 0 1rem
</style>
4 changes: 2 additions & 2 deletions app/src/renderer/components/staking/PageStaking.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template lang="pug">
page(title='Staking')
div(slot="menu"): tool-bar
a(@click='setSearch(true)' v-tooltip.bottom="'Search'")
i.material-icons search
a(@click='updateDelegates(address)' v-tooltip.bottom="'Refresh'")
i.material-icons refresh
a(@click='setSearch(true)' v-tooltip.bottom="'Search'")
i.material-icons search

modal-search(type="delegates")

Expand Down
2 changes: 1 addition & 1 deletion app/src/renderer/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Vue.config.errorHandler = (error, vm, info) => {
Vue.use(Electron)
Vue.use(Resource)
Vue.use(Router)
Vue.use(Tooltip)
Vue.use(Tooltip, { delay: 1 })
Vue.use(Vuelidate)

async function main() {
Expand Down

0 comments on commit 95e3cb3

Please sign in to comment.