You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/03 08:31:45 UTC

[royale-asjs] 01/02: Merge branch 'develop' into feature/new_merge

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

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

commit 1373c43cb59501ecc630922b94a3e1e21e1ce14d
Merge: 4af0b4f f816f90
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Sep 3 11:24:37 2018 +0300

    Merge branch 'develop' into feature/new_merge

 .../src/main/royale/ComboBoxPlayGround.mxml        | 114 ++++++++++++++++++++
 .../src/main/royale/DropDownListPlayGround.mxml    | 117 +++++++++------------
 .../JewelExample/src/main/royale/MainContent.mxml  |   3 +-
 .../src/main/royale/TablePlayGround.mxml           |   2 +-
 .../src/main/royale/models/MainNavigationModel.as  |   5 +-
 .../projects/Jewel/src/main/resources/defaults.css |  50 +++++++--
 .../royale/jewel/beads/views/ComboBoxView.as       |  11 +-
 .../royale/jewel/beads/views/DateFieldView.as      |  68 ++++++++++--
 .../Jewel/src/main/sass/components/_combobox.sass  |  21 +++-
 .../Jewel/src/main/sass/components/_datefield.sass |  36 ++++++-
 10 files changed, 327 insertions(+), 100 deletions(-)