This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 9ac18ade9c32fb0474113cca7572347146258141 Merge: f1948e9 238dcd1 Author: Alex Harui <[email protected]> AuthorDate: Wed Feb 19 15:29:27 2020 -0800 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop .../src/main/royale/CardPlayGround.mxml | 73 +++++++++++++++++++++- .../html/beads/models/ArrayColorSelectionModel.as | 2 +- .../projects/Jewel/src/main/resources/defaults.css | 31 +++++++-- .../Jewel/src/main/resources/jewel-manifest.xml | 3 + .../main/royale/org/apache/royale/jewel/Card.as | 64 +++---------------- .../main/royale/org/apache/royale/jewel/HGroup.as | 19 ------ .../main/royale/org/apache/royale/jewel/VGroup.as | 19 ------ .../beads/controls/tabbar/AssignTabContent.as | 1 - .../royale/jewel/beads/layouts/HorizontalLayout.as | 11 ++-- .../royale/jewel/beads/layouts/VerticalLayout.as | 14 +++-- .../royale/jewel/beads/views/DataGridView.as | 10 +-- .../DrawerFooter.as => card/CardActions.as} | 19 +++--- .../{drawer/DrawerFooter.as => card/CardHeader.as} | 19 +++--- .../DrawerFooter.as => card/CardPrimaryContent.as} | 38 ++++++++--- .../jewel/supportClasses/drawer/DrawerFooter.as | 6 +- .../Jewel/src/main/sass/components/_button.sass | 4 +- .../Jewel/src/main/sass/components/_card.sass | 33 +++++++++- .../Jewel/src/main/sass/components/_datagrid.sass | 2 + .../Jewel/src/main/sass/components/_layout.sass | 2 +- .../JewelTheme/src/main/resources/defaults.css | 31 +++++++-- .../JewelTheme/src/main/sass/_variables.sass | 4 +- .../src/main/sass/components-primary/_alert.sass | 5 +- .../src/main/sass/components-primary/_card.sass | 30 +++++++-- 23 files changed, 267 insertions(+), 173 deletions(-)
