Commit graph

8 commits

Author SHA1 Message Date
Roxanne Skelly
42bf812019 Case 21704 - marketplace button formatting fixes 2019-03-13 15:03:29 -07:00
Ryan Huffman
720cd90dc7 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-18 13:17:28 -08:00
Ryan Huffman
ad471387f7 Integrate marketplace upload API 2018-12-18 13:08:55 -08:00
Wayne Chen
23d3b96446 add spinner/design updates/fix steam link 2018-12-07 15:17:33 -08:00
Wayne Chen
51586625e7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-07 12:02:38 -08:00
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
Alexander Ivash
740123b853 rename stylues-uit => stylesUit & controls-uit => controlsUit
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
Renamed from interface/resources/qml/controls-uit/Button.qml (Browse further)