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/04 12:46:10 UTC
[royale-asjs] branch develop updated: jewel-combobox: refine the
button icon that was bigger due to some recent change in styles
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 97f56d6 jewel-combobox: refine the button icon that was bigger due to some recent change in styles
97f56d6 is described below
commit 97f56d6b842407e33fcdb61f146ed884013e85d4
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Mar 4 13:46:01 2020 +0100
jewel-combobox: refine the button icon that was bigger due to some recent change in styles
---
.../projects/Jewel/src/main/resources/defaults.css | 5 -----
.../Jewel/src/main/sass/components/_combobox.sass | 19 ++++---------------
.../Jewel/src/main/sass/components/_dropdownlist.sass | 4 ++--
.../themes/JewelTheme/src/main/resources/defaults.css | 7 +++++++
.../src/main/sass/components-primary/_combobox.sass | 9 +++++++++
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 850f00d..c2bb071 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -396,15 +396,10 @@ j|ControlBar {
.jewel.combobox .jewel.button::before {
margin: 0;
padding: 0;
- line-height: 22px;
}
.jewel.combobox .jewel.button::after {
content: " ";
position: absolute;
- width: 22px;
- height: 22px;
- left: calc(50% - 11px);
- top: calc(50% - 11px);
}
j|ComboBox {
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
index 5f9fa51..8c421b3 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
@@ -20,38 +20,27 @@
// Jewel ComboBox
// ComboBox variables
-$combobox-button-width: 2.8em
-$combobox-button-size: 22px
-$combobox-input-width: 13.7em
-$combobox-button-xoffset: calc(50% - #{$combobox-button-size/2})
-$combobox-button-yoffset: calc(50% - #{$combobox-button-size/2})
-
+// $combobox-button-width: 2.8em
+// $combobox-input-width: 13.7em
.jewel.combobox
display: inline-flex
.jewel.textinput
- // width: $combobox-input-width
display: block // this makes the combobox adapts to the right size in IE11
+ // width: $combobox-input-width
.jewel.button
// width: $combobox-button-width
+
&::before
margin: 0
padding: 0
- line-height: $combobox-button-size
-
&::after
content: ' '
position: absolute
- width: $combobox-button-size
- height: $combobox-button-size
-
- left: $combobox-button-xoffset
- top: $combobox-button-yoffset
-
j|ComboBox
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ComboBoxModel")
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ComboBoxView")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_dropdownlist.sass b/frameworks/projects/Jewel/src/main/sass/components/_dropdownlist.sass
index 09c3194..5caee64 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_dropdownlist.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_dropdownlist.sass
@@ -24,8 +24,8 @@ $dropdownlist-margin: 0 !default
$dropdownlist-padding-vertical: .68em !default
$dropdownlist-padding-horizontal: 1.12em !default
$dropdownlist-button-size: 22px
-$dropdownlist-button-xoffset: calc(50% - #{$combobox-button-size/2})
-$dropdownlist-button-yoffset: calc(50% - #{$combobox-button-size/2})
+$dropdownlist-button-xoffset: calc(50% - #{$dropdownlist-button-size/2})
+$dropdownlist-button-yoffset: calc(50% - #{$dropdownlist-button-size/2})
.jewel
&.dropdownlist
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 42bc802..dc0dcfd 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -422,9 +422,16 @@ j|CardActions {
border-top-left-radius: 0px;
border-left: 0px;
}
+.jewel.combobox .jewel.button::before {
+ line-height: 22px;
+}
.jewel.combobox .jewel.button::after {
background-size: 66%;
background: url("data:image/svg+xml,%3Csvg viewBox='0 0 12 8' version='1.1' xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg transform='translate(0.000000, -1.000000)' fill='%233CADF1' fill-rule='nonzero'%3E%3Cg transform='translate(-2.000000, 0.000000)'%3E%3Cpolygon transform='translate(8.000000, 4.705000) scale(1, -1) translate(-8.000000, -4.705000) ' points='3.41 8.41 8 3.83 12.59 8.41 14 7 8 1 2 7'%3E%3C/polygon%3E%3C/g [...]
+ width: 14px;
+ height: 22px;
+ left: calc(50% - 8px);
+ top: calc(50% - 11px);
}
.jewel.combobox .jewel.button[disabled] {
border-left: 0px !important;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_combobox.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_combobox.sass
index ab89a6d..6fb2595 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_combobox.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_combobox.sass
@@ -22,6 +22,9 @@
// ComboBox variables
// $combobox-input-width: 8em
$combobox-border-radius: $border-radius
+$combobox-button-size: 22px
+$combobox-button-xoffset: calc(50% - 8px)
+$combobox-button-yoffset: calc(50% - 11px)
.jewel.combobox
.jewel.textinput
@@ -36,10 +39,16 @@ $combobox-border-radius: $border-radius
border-left: 0px
&::before
+ line-height: $combobox-button-size
&::after
background-size: 66%
background: encodeSVG("<svg viewBox='0 0 12 8' version='1.1' xmlns='http://www.w3.org/2000/svg'><g stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'><g transform='translate(0.000000, -1.000000)' fill='#{$primary-color}' fill-rule='nonzero'><g transform='translate(-2.000000, 0.000000)'><polygon transform='translate(8.000000, 4.705000) scale(1, -1) translate(-8.000000, -4.705000) ' points='3.41 8.41 8 3.83 12.59 8.41 14 7 8 1 2 7'></polygon></g></g></g></svg>") no- [...]
+ width: ($combobox-button-size - 8)
+ height: $combobox-button-size
+
+ left: $combobox-button-xoffset
+ top: $combobox-button-yoffset
&[disabled]
border-left: 0px !important