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 2020/08/13 15:05:55 UTC
[royale-asjs] branch develop updated: jewel-sass: remove duplicated
viewports in Card components. Also remove ViewportModels since are only
used in SWF not in JS. If we need, well add using @media -royale-swf
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
The following commit(s) were added to refs/heads/develop by this push:
new ffd9981 jewel-sass: remove duplicated viewports in Card components. Also remove ViewportModels since are only used in SWF not in JS. If we need, well add using @media -royale-swf
ffd9981 is described below
commit ffd9981dabb79e1ae405ef7ca2d1852da8974759
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Aug 13 17:05:41 2020 +0200
jewel-sass: remove duplicated viewports in Card components. Also remove ViewportModels since are only used in SWF not in JS. If we need, well add using @media -royale-swf
---
.../projects/Jewel/src/main/resources/defaults.css | 36 ----------------------
.../projects/Jewel/src/main/sass/_global.sass | 6 ++--
.../sass/components/_applicationmaincontent.sass | 2 +-
.../Jewel/src/main/sass/components/_card.sass | 20 ++++++------
.../Jewel/src/main/sass/components/_datagrid.sass | 2 +-
.../Jewel/src/main/sass/components/_list.sass | 2 +-
.../src/main/sass/components/_navigation.sass | 2 +-
.../src/main/sass/components/_sectioncontent.sass | 2 +-
.../Jewel/src/main/sass/components/_tabbar.sass | 4 +--
.../Jewel/src/main/sass/components/_table.sass | 2 +-
10 files changed, 21 insertions(+), 57 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index c52645f..2dd6554 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -87,7 +87,6 @@ j|Grid {
j|ScrollableGrid {
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
j|GridCell {
@@ -98,7 +97,6 @@ j|Container {
IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
j|HContainer {
@@ -135,7 +133,6 @@ j|DataContainer {
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.StringItemRenderer");
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataContainerItemRendererInitializer");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
j|Validator {
@@ -347,31 +344,6 @@ j|ToggleButtonBar {
text-decoration: none;
}
-j|Card {
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
-}
-
-j|CardHeader {
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
-}
-
-j|CardExpandedContent {
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
-}
-
-j|CardPrimaryContent {
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
-}
-
-j|CardActions {
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
-}
-
.jewel.checkbox {
display: inline-flex;
position: relative;
@@ -601,7 +573,6 @@ j|DataGridListArea {
IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
j|DataGridColumnList {
@@ -3285,7 +3256,6 @@ j|List {
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ListItemRendererInitializer");
ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListSelectableItemRendererBead");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel");
IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.SelectionDataItemRendererFactoryForCollectionView");
}
@@ -3311,7 +3281,6 @@ j|Navigation {
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.NavigationItemRendererInitializer");
ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListHoverOnlySelectableItemRendererBead");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel");
IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.SelectionDataItemRendererFactoryForCollectionView");
}
@@ -3522,7 +3491,6 @@ j|SectionContent {
j|ScrollableSectionContent {
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
.jewel.slider {
@@ -3736,7 +3704,6 @@ j|TabBar {
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.TabBarItemRendererInitializer");
ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListSelectableItemRendererBead");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel");
IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.SelectionDataItemRendererFactoryForCollectionView");
}
@@ -3786,7 +3753,6 @@ j|TabBarContent {
IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
.jewel.simpletable {
@@ -3856,7 +3822,6 @@ j|Table {
ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListSelectableItemRendererBead");
IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.itemRenderers.TableItemRendererFactoryForCollectionView");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
IContentView: ClassReference("org.apache.royale.jewel.supportClasses.table.TBodyContentArea");
}
@@ -4259,7 +4224,6 @@ j|ApplicationMainContent {
IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout");
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
/*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index edf3d91..cc43255 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -88,7 +88,7 @@ j|Grid
j|ScrollableGrid
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
j|GridCell
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.GridCellLayout")
@@ -97,7 +97,7 @@ j|Container
IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView")
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//align-items: flex-start
j|HContainer
@@ -130,7 +130,7 @@ j|DataContainer
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.StringItemRenderer")
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataContainerItemRendererInitializer")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
j|Validator
ILocalizedValuesImpl: ClassReference("org.apache.royale.core.SimpleLocalizedValuesImpl")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_applicationmaincontent.sass b/frameworks/projects/Jewel/src/main/sass/components/_applicationmaincontent.sass
index 97afe11..fad0115 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_applicationmaincontent.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_applicationmaincontent.sass
@@ -44,4 +44,4 @@ j|ApplicationMainContent
IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView")
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
\ No newline at end of file
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_card.sass b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
index 8828761..60d09f8 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_card.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
@@ -71,27 +71,27 @@ $card-primary-content-minheight: 152px !default
text-decoration: none
j|Card
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ //IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
j|CardHeader
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ //IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
j|CardExpandedContent
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ //IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
j|CardPrimaryContent
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ //IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
j|CardActions
- IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ //IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
index 5ee6669..85305f2 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
@@ -72,7 +72,7 @@ j|DataGridListArea
IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView")
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
j|DataGridColumnList
IItemRendererClassFactory: ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
index db98b27..4e64097 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
@@ -48,7 +48,7 @@ j|List
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ListItemRendererInitializer")
ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListSelectableItemRendererBead")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel")
IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.SelectionDataItemRendererFactoryForCollectionView")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass b/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
index a31d9e2..4f619f4 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
@@ -34,7 +34,7 @@ j|Navigation
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.NavigationItemRendererInitializer")
ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListHoverOnlySelectableItemRendererBead")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel")
IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.SelectionDataItemRendererFactoryForCollectionView")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass b/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
index 8fe2f99..0ff0c56 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_sectioncontent.sass
@@ -40,6 +40,6 @@ j|SectionContent
j|ScrollableSectionContent
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
// IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
// gap: 3
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass b/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
index 6805e11..a4e4631 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
@@ -56,7 +56,7 @@ j|TabBar
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.TabBarItemRendererInitializer")
ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListSelectableItemRendererBead")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel")
IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.SelectionDataItemRendererFactoryForCollectionView")
@@ -117,4 +117,4 @@ j|TabBarContent
IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView")
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
\ No newline at end of file
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_table.sass b/frameworks/projects/Jewel/src/main/sass/components/_table.sass
index 0d259e4..265a3af 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_table.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_table.sass
@@ -99,7 +99,7 @@ j|Table
ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListSelectableItemRendererBead")
IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.itemRenderers.TableItemRendererFactoryForCollectionView")
IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport")
- IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
+ // IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
IContentView: ClassReference("org.apache.royale.jewel.supportClasses.table.TBodyContentArea")