Jaco Greeff
a1a8181913
Merge branch 'master' into ui-2
2017-07-11 12:38:51 +02:00
Jaco Greeff
3d24ae0981
Merge branch 'master' into ui-2
2017-07-10 17:36:55 +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
566b6a1967
Merge branch 'master' into ui-2
...
# Conflicts:
# js/src/shared/redux/middleware.js
# js/src/shared/redux/providers/registry/middleware.js
# js/src/shell/Application/application.js
# js/src/ui/Actionbar/actionbar.js
# js/src/ui/Button/button.js
# js/src/ui/Form/AddressSelect/addressSelect.js
# js/src/ui/Form/Input/input.js
# js/src/ui/MethodDecoding/methodDecoding.js
2017-05-10 17:29:07 +02:00
