You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2020/01/02 02:59:53 UTC

[royale-asjs] 03/03: Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit df15b03520061ffaa65ea887046effb637d5d4af
Merge: c55743a 1d9a545
Author: greg-dove <gr...@gmail.com>
AuthorDate: Thu Jan 2 15:05:33 2020 +1300

    Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

 .../src/main/resources/jewel-example-styles.css    | 14 +++++++--
 .../AdvancedIconListItemRenderer.mxml              | 33 +++++++---------------
 .../projects/Jewel/src/main/resources/defaults.css |  8 +++---
 .../jewel/itemRenderers/DataGridItemRenderer.as    |  2 +-
 .../Jewel/src/main/sass/components/_datagrid.sass  |  2 +-
 .../src/main/sass/components/_itemRenderer.sass    |  2 +-
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                | 16 +++++------
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../src/main/resources/defaults.css                |  4 +--
 .../JewelTheme/src/main/resources/defaults.css     | 24 ++++++++--------
 .../main/sass/components-emphasized/_datagrid.sass |  2 +-
 .../main/sass/components-primary/_datagrid.sass    |  2 +-
 .../sass/components-primary/_itemRenderer.sass     |  2 +-
 .../main/sass/components-secondary/_datagrid.sass  |  2 +-
 83 files changed, 333 insertions(+), 336 deletions(-)