3 Commits

Author	SHA1	Message	Date
Jaco Greeff	c1599a3d85	Merge branch 'master' into ui-2 ... # Conflicts: # js/src/ui/Balance/balance.js	2017-06-08 11:51:46 +02:00
Jaco Greeff	602115d81e	Merge branch 'master' into ui-2 ... # Conflicts: # js/src/shell/Connection/connection.js # js/src/ui/Icons/index.js # js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js	2017-05-19 14:55:13 +02:00
Jaco Greeff	37dd488579	UI 2 component & modal splits (#5525) ... * Remove mui from Actionbar * Add semantic-ui to vendor.js * Stateless components * Multi-item spacing * Stateless components * Stateless components * Default font * Context passing * Move Vault modals into Vault dapp * Move modals to their respective views	2017-04-28 11:21:05 +02:00