Merge pull request #1119 from cosmos/jordan/1044-wallet

Jordan/1044 wallet

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-* removed light theme option from preferences page @jolesbi
+* removed light theme option from preferences page @jbibla
 * enabled staked balance on PageWallet in production @faboweb
 * removed unused xmlhttprequest dependency @faboweb
 * LCD staking endpoints @fedekunze @faboweb
@@ -26,9 +26,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * testnets not properly available after download @faboweb
 * Tell the main process when we switch to the mock network. @NodeGuy
-* improved tooltip styling @jolesbi
+* improved tooltip styling @jbibla
 * Sort validators by "Your Votes" fixed @okwme
 * Overflow bonding bar bug @okwme
+* improved modal and wallet styling @jbibla
 
 ## [0.9.3] - 2018-08-02
 
@@ -40,14 +41,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-* button styling @jolesbi
+* button styling @jbibla
 * Switched to Gaia-7004 @faboweb
 * showing warning about out of range of atoms in bonding UI only once on top and renaming it @faboweb
 * blocking login if not connected to a node to prevent errors @faboweb
 
 ### Fixed
 
-* broken styles in light theme @jolesbi
+* broken styles in light theme @jbibla
 * slider in staking UI @faboweb
 * error with empty accounts @faboweb
 
@@ -107,7 +108,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Using vue-jest for transpiling in tests for better code coverage output @faboweb
 * Default to gaia-7001 @okwme
 * Changed `yarn testnet` to `yarn start` @okwme
-* Updated colors throughout @jolesbi
+* Updated colors throughout @jbibla
 * Update network @okwme
 
 ### Fixed
@@ -140,11 +141,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 
 * Use persistent peers and seeds from tendermint config @faboweb
-* Updated loading icon and loading states @jolesbi
+* Updated loading icon and loading states @jbibla
 * more components moved to `@tendermint/ui` @okwme
 * Removed COSMOS_MOCKED flag @faboweb
-* Improved readability and accessibility @jolesbi
-* Significant style and UI updates for dark and light themes @jolesbi
+* Improved readability and accessibility @jbibla
+* Significant style and UI updates for dark and light themes @jbibla
 * Doesn't show loading screen when validators are still stored @okwme
 * Improved CI @faboweb
 * Search bar fixed to top @okwme
@@ -179,7 +180,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * Disabled error reporting in development @faboweb
 * Removed ci files from code coverage as they are badly testable @faboweb
-* Update genesis.json when conflicts are detected @jolesbi
+* Update genesis.json when conflicts are detected @jbibla
 * Hide IBC as it will not be ready for launch @faboweb
 * Updated e2e tests to not rely on flags to run @okwme
 * Not shrinking stacktrace anymore @faboweb
@@ -227,12 +228,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Build process now builds for all three platforms at the same time. @NodeGuy
 * The config.toml is now mocked to guarantee consistent unit tests @faboweb
 * The binary is now accepted if it has the same minor version instead of the path version. @faboweb
-* Hid staking button on wallet page @jolesbi
-* Increment version in package.json @jolesbi
+* Hid staking button on wallet page @jbibla
+* Increment version in package.json @jbibla
 * Profile page now settings with forked ni-vue-field @okwme @nylira
-* Added proper voyager logo to readme @jolesbi
+* Added proper voyager logo to readme @jbibla
 * Made search consistent @okwme
-* Change gaia-2 to gaia-5001 in readme @jolesbi
+* Change gaia-2 to gaia-5001 in readme @jbibla
 * Improved readme with better prerequisite instructions @nylira
 
 ### Fixes
@@ -301,7 +302,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * Added `mvp-features.md` to documentation. @nylira
 * Added full page error @nylira
-* Added receive button and receive modal @jolesbi
+* Added receive button and receive modal @jbibla
 * The validator hash now has to be approved by the user for security @faboweb
 * Transitioned to Docker for easier cross platform builds. @NodeGuy
 * New light theme for day time Voyaging 😎 🚀 @nylira
@@ -327,12 +328,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-* Added back button to every page. @jolesbi
+* Added back button to every page. @jbibla
 
 ### Changed
 
-* Updated transaction history to be more clear and descriptive. @jolesbi
-* Improved delegate profile page to accommodate candidates and validators. @jolesbi
+* Updated transaction history to be more clear and descriptive. @jbibla
+* Improved delegate profile page to accommodate candidates and validators. @jbibla
 
 ## [0.4.1] - 2018-02-01
 
@@ -379,4 +380,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-* Added a changelog @jolesbi.
+* Added a changelog @jbibla.

app/src/renderer/components/common/TmModal.vue

@@ -47,45 +47,31 @@ export default {
   align-items center
   backdrop-filter blur(0.5em)
 
+  b
+    font-weight 500
+    color var(--bright)
+
   &.tm-modal-fullscreen
     display flex
 
-    .tm-modal-container
-      flex 1
-      height 100vh
-      max-height 100vh
-      max-width 40rem + 6rem
-      display flex
-      flex-flow column nowrap
-
-      .tm-modal-main
-        flex 1
-        overflow-y scroll
-        display block
-
 .tm-modal-container
   background var(--app-fg)
   box-shadow hsla(0,0,0,0.25) 0 0.25rem 1rem
-
   display flex
   flex-flow column nowrap
-
   min-width 20rem
-  min-height 20rem
-
-  max-width 30rem
-  max-height 40rem
+  max-width 40rem
 
 .tm-modal-header
   display flex
   flex-flow row nowrap
   align-items center
   flex 0 0 3rem + 0.0625rem
+  padding 2rem 1rem
   background var(--app-nav)
 
 .tm-modal-icon
   height 3rem
-  flex 0 0 3rem
   display flex
   align-items center
   justify-content center
@@ -95,21 +81,22 @@ export default {
   &.tm-modal-close
     cursor pointer
     i
-      color var(--link)
+      color var(--txt)
     &:hover i
-      color var(--hover)
+      color var(--link)
 
 .tm-modal-icon + .tm-modal-title
   padding-left 0
 
 .tm-modal-title
   flex 1
   font-size h3
-  color var(--txt)
+  font-weight 500
+  color var(--bright)
   padding 0 1rem
 
-.tm-modal-main, .tm-modal-footer
-  padding 1rem
+.tm-modal-main
+  padding 2rem 1rem
 
 .tm-modal-main + .tm-modal-footer
   border-top px solid var(--bc)
@@ -125,16 +112,20 @@ export default {
 
 .tm-modal-main p
   margin-bottom 1rem
-
-.tm-modal-main > .tm-article-body
-  margin -1rem
+  padding 0 1rem
+  word-wrap break-word
+  color var(--txt)
 
 .tm-modal-footer
-  flex 0 0 4rem + px
+  padding 1rem
+
+  button
+    padding-left 1rem
+
   &:empty
     display none
 
 .tm-modal-footer > div
   display flex
-  justify-content space-between
+  justify-content flex-end
 </style>

app/src/renderer/components/common/TmModalHelp.vue

@@ -1,13 +1,8 @@
 <template lang="pug">
 modal.tm-modal-help(v-if="active" :close="close")
   div(slot='title') Need Help?
-  p Something in the app not working correctly? Tell us what went wrong in developer chat or create an issue on our GitHub. Thanks for improving Cosmos Voyager!
-  tm-list-item(
-    title="Developer Chat"
-    href="https://riot.im/app/#/room/#cosmos:matrix.org")
-  tm-list-item(
-    title="GitHub Issues"
-    href="https://github.com/cosmos/voyager/issues")
+  p Something in the app not working correctly? Tell us what went wrong in our <a href="https://riot.im/app/#/room/#cosmos:matrix.org">developer chat</a> or create an issue on <a href="https://github.com/cosmos/voyager/issues">GitHub</a>.
+  p Thanks for improving Cosmos Voyager!
 </template>
 
 <script>
@@ -39,10 +34,4 @@ export default {
 
 .tm-modal.tm-modal-help
   z-index z(modalHelp)
-
-  .tm-modal-main
-    padding 2rem
-
-    p
-      margin 0 0 2rem
 </style>

app/src/renderer/components/common/TmModalReceive.vue

@@ -35,16 +35,4 @@ export default {
 
 .tm-modal.tm-modal-receive
   z-index z(modalError)
-
-  .tm-modal-main
-    padding 2rem
-
-    p
-      margin 0 0 2rem
-
-  .receive-modal
-    border 1px solid bc
-
-  .value
-    padding 0
 </style>

app/src/renderer/components/common/TmPart.vue

@@ -17,53 +17,3 @@ export default {
   props: ["title"]
 }
 </script>
-
-<style lang="stylus">
-@require '~variables'
-
-.tm-part
-  position relative
-  max-width width-main-max
-  background var(--app-fg)
-  border-radius 2px
-  margin 1rem 0
-
-.tm-part-container,
-.tm-part-header,
-.tm-part-title,
-.tm-part-menu,
-.tm-part-main
-  &:empty
-    display none
-
-.tm-part-main
-  background: blue
-
-.tm-part-container
-  margin 0 auto
-
-.tm-part-header
-  padding 1rem 1rem 0.5rem
-  border-radius 2px
-  background var(--app-fg)
-
-.tm-part-header-container
-  display flex
-  align-items center
-
-.tm-part-title, .tm-part-menu
-  color var(--dim)
-  margin 0
-
-  a
-    color var(--link)
-
-    &:hover
-      color var(--hover)
-
-.tm-part-title
-  flex 1
-  color var(--dim)
-  font-size sm
-  font-weight 400
-</style>

app/src/renderer/components/staking/PageStaking.vue

@@ -28,7 +28,7 @@ tm-page(title='Staking')
 <script>
 import { mapGetters } from "vuex"
 import num from "scripts/num"
-import { includes, orderBy, forEach } from "lodash"
+import { includes, orderBy } from "lodash"
 import Mousetrap from "mousetrap"
 import LiDelegate from "staking/LiDelegate"
 import { TmBtn, TmPage, TmDataEmpty, TmDataLoading } from "@tendermint/ui"

app/src/renderer/components/wallet/PageSend.vue

@@ -50,7 +50,6 @@ tm-page(title='Send')
       br(v-if='mockedConnector')
 
     div(slot='footer')
-      div
       tm-btn(v-if='sending' value='Sending...' disabled color="primary")
       tm-btn(v-else @click='onSubmit' value="Send Tokens" color="primary")
 
@@ -214,3 +213,13 @@ export default {
   }
 }
 </script>
+
+<style lang="stylus">
+@require '~variables'
+
+.tm-form-footer
+  max-width width-main-max
+  display flex
+  justify-content flex-end
+
+</style>