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/02 15:09:17 UTC
[royale-asjs] branch develop updated: make ComboBox display in
classic mode in desktop/widescreen sizes
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 cba9b1d make ComboBox display in classic mode in desktop/widescreen sizes
cba9b1d is described below
commit cba9b1ddc4ede45ead783ceaa1b08ba7299f052b
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Sep 2 17:09:12 2018 +0200
make ComboBox display in classic mode in desktop/widescreen sizes
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 13 +++++++++++++
frameworks/projects/Jewel/src/main/royale/JewelClasses.as | 2 +-
.../royale/jewel/beads/controls/drawer/ResponsiveDrawer.as | 2 +-
.../royale/jewel/{ => supportClasses}/ResponsiveSizes.as | 2 +-
.../projects/Jewel/src/main/sass/components/_combobox.sass | 13 +++++++++++++
5 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index ce34499..3dd04fb 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -338,6 +338,19 @@ j|ComboBox {
width: calc(100% - 300px);
}
}
+@media (min-width: 992px) {
+ .combobox-popup::before {
+ background-color: rgba(0, 0, 0, 0);
+ }
+ .combobox-popup .jewel.list {
+ box-shadow: none !important;
+ }
+ .combobox-popup.open .jewel.list {
+ transform: none;
+ top: auto;
+ left: auto;
+ }
+}
j|ComboBoxList {
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout");
IContentView: ClassReference("org.apache.royale.jewel.supportClasses.combobox.ComboBoxListDataGroup");
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index ea2945a..9a1f0fd 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -76,7 +76,7 @@ package
import org.apache.royale.jewel.beads.controllers.DropDownListController; DropDownListController;
}
- import org.apache.royale.jewel.ResponsiveSizes; ResponsiveSizes;
+ import org.apache.royale.jewel.supportClasses.ResponsiveSizes; ResponsiveSizes;
import org.apache.royale.jewel.supportClasses.INavigationRenderer; INavigationRenderer;
import org.apache.royale.jewel.supportClasses.IActivable; IActivable;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/drawer/ResponsiveDrawer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/drawer/ResponsiveDrawer.as
index 4b686c0..3f3109d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/drawer/ResponsiveDrawer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/drawer/ResponsiveDrawer.as
@@ -21,8 +21,8 @@ package org.apache.royale.jewel.beads.controls.drawer
import org.apache.royale.core.IBead;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
- import org.apache.royale.jewel.ResponsiveSizes;
import org.apache.royale.jewel.Drawer;
+ import org.apache.royale.jewel.supportClasses.ResponsiveSizes;
/**
* The ResponsiveDrawer class is a bead to use with Jewel Drawer to make it fixed or
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ResponsiveSizes.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/ResponsiveSizes.as
similarity index 97%
rename from frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ResponsiveSizes.as
rename to frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/ResponsiveSizes.as
index 0bd97bd..37bfe4b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ResponsiveSizes.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/ResponsiveSizes.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel
+package org.apache.royale.jewel.supportClasses
{
/**
* The ResponsiveSizes declares consants that are related to SASS variables
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
index f30ef94..1e67397 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
@@ -131,6 +131,19 @@ $combobox-popup-overlay-opacity: .65 !default
.jewel.list
width: calc(100% - #{30*$combobox-popup-margin-offset})
+@media (min-width: $desktop)
+ .combobox-popup
+ &::before
+ background-color: rgba($combobox-popup-overlay-color, 0)
+ .jewel.list
+ box-shadow: none !important
+ &.open
+ .jewel.list
+ transform: none
+ top: auto
+ left: auto
+
+
j|ComboBoxList
// IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ListView")