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 240bca9 Jewel DateChooser styles closer to what it should be 240bca9 is described below commit 240bca91194a1ca29d7bf32779bd194a14a8bb70 Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Mon Aug 6 19:04:17 2018 +0200 Jewel DateChooser styles closer to what it should be --- .../projects/Jewel/src/main/resources/defaults.css | 7 +++--- .../royale/jewel/beads/views/DateFieldView.as | 4 ++-- .../src/main/sass/components/_datechooser.sass | 13 ++++++++--- .../JewelTheme/src/main/resources/defaults.css | 13 +++++++++-- .../main/sass/components-primary/_datechooser.sass | 26 ++++++++++++++++++---- 5 files changed, 49 insertions(+), 14 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css index b6aa9dd..f4ee9d5 100644 --- a/frameworks/projects/Jewel/src/main/resources/defaults.css +++ b/frameworks/projects/Jewel/src/main/resources/defaults.css @@ -246,10 +246,11 @@ j|ControlBar { IMeasurementBead: ClassReference("org.apache.royale.html.beads.ControlBarMeasurementBead"); } } +.jewel.datechooser .jewel.table td { + padding: 0px; +} + .calendar.item { - width: 36px; - height: 36px; - text-align: center; padding: 10px; } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as index d71d2bc..a3b4575 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as @@ -203,8 +203,8 @@ package org.apache.royale.jewel.beads.views if (!_popUp) { _popUp = new DateChooser(); - _popUp.width = 210; - _popUp.height = 230; + // _popUp.width = 210; + // _popUp.height = 230; } var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel; diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass b/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass index b3fc4a7..9ea1676 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass @@ -22,12 +22,19 @@ // DateChooser variables .jewel.datechooser + + .jewel.table + + + th + + tbody + tr + td + padding: 0px .calendar &.item - width: 36px - height: 36px - text-align: center padding: 10px j|DateChooser diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css index b368131..30b016f 100644 --- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css +++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css @@ -235,13 +235,22 @@ j|Card { .jewel.datechooser { background: white; - width: 280px; + width: 330px; } -.jewel.datechooser .jewel.button, .jewel.datechooser .jewel.list { +.jewel.datechooser .jewel.table { background: white; border: none; box-shadow: none; } +.jewel.datechooser .jewel.table th { + background: white; + box-shadow: none; + border-left: 0px; +} +.jewel.datechooser .jewel.table td { + border-top: 0px; + border-left: 0px; +} .calendar.item { font-size: 1em; diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass index d7562d7..dcb34b5 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass @@ -22,14 +22,32 @@ // DateChooser variables .jewel.datechooser - background: white - width: 280px + background: lighten($default-color, 20%) + width: 330px - .jewel.button, .jewel.list - background: white + // .jewel.button + // , .jewel.list + // background: white + // border: none + // box-shadow: none + + .jewel.table + background: lighten($default-color, 20%) border: none box-shadow: none + th + @if $flat + background: lighten($default-color, 20%) + @else + background: lighten($default-color, 20%) + box-shadow: none + border-left: 0px + td + border-top: 0px + border-left: 0px + + .calendar &.item font: