Commit Graph

5 Commits

Author SHA1 Message Date
Jaco Greeff
7f77e6004c Cleanup selector (#5971) 2017-07-03 10:36:34 +02:00
Jaco Greeff
7bbd48a2bd Merge branch 'master' into ui-2
# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js
2017-06-13 11:02:38 +02:00
Jaco Greeff
5da7c32bdf Ui 2 radios & imports (#5609)
* Remove mui IconButton

* Token type selection

* Convert RadioButtons

* RadioButtons consistency

* Import @parity/ui

* Import @parity/ui

* Explicit name for RadioButtons

* Convert to semantic Radio
2017-05-12 12:06:16 +02:00
Jaco Greeff
861cbb874b Ui 2 ui (#5582)
Ui 2 small UI fixes
2017-05-09 17:31:48 +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