You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/09/10 11:27:10 UTC

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

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

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

commit 5dae46559cc363eee7dd611202a951cdf3a37d09
Merge: 8eb1d64 e8c4bd0
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Sep 10 12:33:58 2018 +0200

    Merge branch 'feature/jewel-snackbar' into develop
    
    * feature/jewel-snackbar:
      better use StyleUIBase methods
      forgot to add theme styles
      Code need COMPILE::JS blocks to compile (maybe you can compile it since your're using a JS only version?). This solves the conflicts and the code runs right.
      SASS doesn't allow ";" characters and indentation is not right for SASS to compile. @yestaro, you need to compile SASS file with ANT or Maven (this one is setup out-of-the-box). default.css file is update in the SASS compilation to get the generated CSS
      Merge branch 'develop' of https://github.com/yestaro/royale-asjs into feature/jewel-snackbar

 .../src/main/royale/FormsValidationPlayGround.mxml |   2 +-
 .../JewelExample/src/main/royale/MainContent.mxml  |   1 +
 .../src/main/royale/SnackbarPlayGround.mxml        |  92 +++++++++
 .../src/main/royale/models/MainNavigationModel.as  |   3 +-
 .../projects/Jewel/src/main/resources/defaults.css |  45 +++++
 .../Jewel/src/main/resources/jewel-manifest.xml    |   1 +
 .../projects/Jewel/src/main/royale/JewelClasses.as |   3 +
 .../royale/org/apache/royale/jewel/Snackbar.as     | 224 +++++++++++++++++++++
 .../jewel/beads/controllers/SnackbarController.as  | 149 ++++++++++++++
 .../royale/jewel/beads/models/SnackbarModel.as     | 143 +++++++++++++
 .../royale/jewel/beads/validators/FormValidator.as |   4 +-
 .../royale/jewel/beads/views/SnackbarView.as       | 146 ++++++++++++++
 .../Jewel/src/main/sass/components/_snackbar.sass  |  57 ++++++
 .../projects/Jewel/src/main/sass/defaults.sass     |   2 +-
 .../JewelTheme/src/main/resources/defaults.css     |  54 +++++
 .../main/sass/components-emphasized/_snackbar.sass |  38 ++++
 .../main/sass/components-primary/_snackbar.sass    |  38 ++++
 .../main/sass/components-secondary/_snackbar.sass  |  38 ++++
 .../themes/JewelTheme/src/main/sass/defaults.sass  |   3 +
 19 files changed, 1039 insertions(+), 4 deletions(-)