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/03/22 22:50:34 UTC
[royale-asjs] branch develop updated: jewel-badge: temporal fix for
badges clipped
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 ecd7312 jewel-badge: temporal fix for badges clipped
ecd7312 is described below
commit ecd7312c2073ba5fe78ae06b0bd44b1111d855b8
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Mar 22 23:50:27 2020 +0100
jewel-badge: temporal fix for badges clipped
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 3 +++
.../royale/org/apache/royale/jewel/beads/controls/Badge.as | 10 +++++-----
.../projects/Jewel/src/main/sass/components/_button.sass | 3 +++
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 24837c4..13f4e3f 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -265,6 +265,9 @@ j|Alert {
.jewel.button .fonticon {
cursor: inherit;
}
+.jewel.button.viewport {
+ overflow: visible;
+}
@media -royale-swf {
j|Button {
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
index 04d703f..0a9228f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
@@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.controls
{
import org.apache.royale.core.IBead;
import org.apache.royale.core.IStrand;
- import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.StyledUIBase;
import org.apache.royale.jewel.Label;
import org.apache.royale.utils.IEmphasis;
@@ -68,7 +68,7 @@ package org.apache.royale.jewel.beads.controls
return badge;
}
- private var host:UIBase;
+ private var host:StyledUIBase;
/**
* @copy org.apache.royale.core.IBead#strand
*
@@ -79,11 +79,11 @@ package org.apache.royale.jewel.beads.controls
*/
public function set strand(value:IStrand):void
{
- host = value as UIBase;
+ host = value as StyledUIBase;
COMPILE::JS
{
- host.element.classList.add("visible");
- host.element.classList.add("viewport");
+ host.addClass("viewport");
+ host.addClass("visible");
}
badge.toggleClass("preindex", _preindex);
badge.toggleClass("subindex", _subindex);
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_button.sass b/frameworks/projects/Jewel/src/main/sass/components/_button.sass
index 90f4b0e..3ccaba9 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_button.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_button.sass
@@ -53,6 +53,9 @@
.fonticon
cursor: inherit
+ // temporal for badges (we need to refactor it)
+ &.viewport
+ overflow: visible
@media -royale-swf
j|Button