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 feb3328 jewel-table: move paddings to theme part and remove part of
paddings to use in initializers for configurability
feb3328 is described below
commit feb3328ccab6a24de3e5c7dc279072b90f1e7e9b
Author: Carlos Rovira <[email protected]>
AuthorDate: Wed Jul 1 19:33:02 2020 +0200
jewel-table: move paddings to theme part and remove part of paddings to use
in initializers for configurability
---
.../projects/Jewel/src/main/resources/defaults.css | 16 +---------------
.../itemRenderers/TableItemRendererInitializer.as | 4 ++++
.../royale/jewel/itemRenderers/TableItemRenderer.as | 5 -----
.../Jewel/src/main/sass/components/_table.sass | 20 +++++---------------
.../JewelTheme/src/main/resources/defaults.css | 11 +++++++++++
.../src/main/sass/components-primary/_table.sass | 13 +++++++++++++
6 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index f7a3bdb..00ec11b 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -3780,7 +3780,6 @@ j|TabBarContent {
vertical-align: bottom;
text-overflow: ellipsis;
letter-spacing: 0;
- padding: 12px;
text-align: left;
}
.jewel.simpletable .jewel.tbody .jewel.tablerow {
@@ -3791,9 +3790,6 @@ j|TabBarContent {
.jewel.simpletable .jewel.tablecell {
position: relative;
}
-.jewel.simpletable .jewel.tablecell > * {
- padding: 12px;
-}
j|SimpleTable {
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout");
@@ -3808,7 +3804,6 @@ j|SimpleTable {
vertical-align: bottom;
text-overflow: ellipsis;
letter-spacing: 0;
- padding: 12px;
text-align: left;
}
.jewel.table .jewel.tbody .jewel.tablerow {
@@ -3818,6 +3813,7 @@ j|SimpleTable {
}
.jewel.table .jewel.tablecell {
position: relative;
+ height: 100%;
}
.jewel.table.fixedHeader {
overflow-y: auto;
@@ -3844,7 +3840,6 @@ j|Table {
}
.jewel.tableitem {
- padding: 10px;
cursor: pointer;
text-decoration: none;
letter-spacing: 0;
@@ -3855,15 +3850,6 @@ j|Table {
.jewel.tableitem.selectable {
cursor: pointer;
}
-.jewel.tableitem.with-childs {
- padding: 6px;
-}
-.jewel.tableitem.calendar {
- border-radius: 4px;
-}
-.jewel.tableitem.calendar.selected {
- font-weight: bold;
-}
.empty-cell {
pointer-events: none;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
index 5f31f70..6a61f62 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
@@ -82,6 +82,10 @@ package org.apache.royale.jewel.beads.itemRenderers
if (tir && ownerView)
tir.itemRendererOwnerView = ownerView;
+
+ setPaddings(tir);
}
+
+ // public static const DEFAULT_PADDING:Number = 8;
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TableItemRenderer.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TableItemRenderer.as
index 375df7e..ae868c1 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TableItemRenderer.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TableItemRenderer.as
@@ -49,11 +49,6 @@ package org.apache.royale.jewel.itemRenderers
super();
typeNames = "jewel tableitem";
-
- if(MXMLDescriptor != null)
- {
- typeNames += " with-childs";
- }
textAlign = new TextAlign();
addBead(textAlign);
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_table.sass
b/frameworks/projects/Jewel/src/main/sass/components/_table.sass
index c473b3f..9a87530 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_table.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_table.sass
@@ -32,7 +32,6 @@
vertical-align: bottom
text-overflow: ellipsis
letter-spacing: 0
- padding: 12px
text-align: left
.jewel.tbody
@@ -45,8 +44,6 @@
//td
.jewel.tablecell
position: relative
- > *
- padding: 12px
j|SimpleTable
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout")
@@ -57,10 +54,7 @@ j|SimpleTable
// Table variables
$tableitem-min-height: 34px
.jewel.table
- //position: relative
- //white-space: nowrap
- // overflow: hidden
-
+
table
width: 100%
border-spacing: 0px
@@ -71,7 +65,6 @@ $tableitem-min-height: 34px
vertical-align: bottom
text-overflow: ellipsis
letter-spacing: 0
- padding: 12px
text-align: left
.jewel.tbody
@@ -84,8 +77,7 @@ $tableitem-min-height: 34px
// td
.jewel.tablecell
position: relative
- // > *
- // padding: 12px
+ height: 100%
&.fixedHeader
overflow-y: auto
@@ -111,7 +103,7 @@ j|Table
.jewel.tableitem
- padding: 10px
+ // padding: 10px
cursor: pointer
text-decoration: none
// align-items: center
@@ -125,13 +117,11 @@ j|Table
cursor: pointer
// pointer-events: auto
- &.with-childs
- padding: 6px
&.calendar
- border-radius: 4px
+ // border-radius: 4px
&.selected
- font-weight: bold
+ // font-weight: bold
.empty-cell
pointer-events: none
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 7d39eb0..b8ac749 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -1198,6 +1198,7 @@ j|FormItem {
border-left: 0px;
}
.jewel.simpletable .jewel.tableheadercell {
+ padding: 12px;
background: linear-gradient(white, #f3f3f3);
box-shadow: inset 0 1px 0 white;
font-weight: 700;
@@ -1213,6 +1214,9 @@ j|FormItem {
border-top: 1px solid #d9d9d9;
border-left: 1px solid #d9d9d9;
}
+.jewel.simpletable .jewel.tablecell > * {
+ padding: 12px;
+}
.jewel.simpletable .jewel.tfoot .jewel.tablecell {
border-left: 0px;
background: linear-gradient(white, white);
@@ -1229,6 +1233,7 @@ j|FormItem {
border-left: 0px;
}
.jewel.table .jewel.tableheadercell {
+ padding: 12px;
background: linear-gradient(white, #f3f3f3);
box-shadow: inset 0 1px 0 white;
font-weight: 700;
@@ -1265,6 +1270,12 @@ j|FormItem {
color: #FFFFFF;
background: #24a3ef;
}
+.jewel.tableitem.calendar {
+ border-radius: 4px;
+}
+.jewel.tableitem.calendar.selected {
+ font-weight: bold;
+}
a:link {
color: #3CADF1;
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
index e664fc9..27ba248 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
@@ -40,6 +40,7 @@ $simpletable-border-radius: $border-radius
.jewel.tableheadercell:first-of-type
border-left: 0px
.jewel.tableheadercell
+ padding: 12px
@if $flat
background: lighten($default-color, 10%)
box-shadow: none
@@ -62,6 +63,9 @@ $simpletable-border-radius: $border-radius
border-top: 1px solid $default-color
border-left: 1px solid $default-color
+ > *
+ padding: 12px
+
.jewel.tfoot
.jewel.tablecell
border-left: 0px
@@ -97,6 +101,7 @@ $table-border-radius: $border-radius
.jewel.tableheadercell:first-of-type
border-left: 0px
.jewel.tableheadercell
+ padding: 12px
@if $flat
background: lighten($default-color, 10%)
box-shadow: none
@@ -119,6 +124,8 @@ $table-border-radius: $border-radius
.jewel.tablecell
border-top: 1px solid $default-color
border-left: 1px solid $default-color
+ // > *
+ // padding: 12px
.jewel.tfoot
.jewel.tablecell
@@ -147,3 +154,9 @@ $table-border-radius: $border-radius
&.selected, &.selectable:active
color: $font-theme-color
background: darken($primary-color, 5%)
+
+ &.calendar
+ border-radius: 4px
+
+ &.selected
+ font-weight: bold
