Use imageStyleClass for btn-close icon

Servoy · Sep 14, 2020 · a4722cc · a4722cc
1 parent 134e72e
commit a4722cc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/svyPopupFilter/forms/svyDatePopupFilter.frm b/svyPopupFilter/forms/svyDatePopupFilter.frm
@@ -185,16 +185,18 @@ top:"0",
 width:"25"
 },
 faclass:"fa fa-close",
+imageStyleClass:"fa fa-close",
 onActionMethodID:"F18750A2-44A6-4CC0-B6A9-C973F0569851",
 size:{
 height:25,
 width:25
 },
+styleClass:"default-align text-tertiary clickable",
 styleclass:"fa fa-close text-tertiary clickable"
 },
 name:"faClose",
 size:"25,25",
-styleClass:"fa fa-close text-tertiary clickable",
+styleClass:"default-align text-tertiary clickable",
 typeName:"bootstrapcomponents-label",
 typeid:47,
 uuid:"A159D254-8C83-4D01-A915-08C5927D10CC"

diff --git a/svyPopupFilter/forms/svyIntegerPopupFilter.frm b/svyPopupFilter/forms/svyIntegerPopupFilter.frm
@@ -673,6 +673,7 @@ items:[
 {
 json:{
 faclass:"fa fa-close",
+imageStyleClass:"fa fa-close",
 location:{
 x:1,
 y:1
@@ -682,13 +683,13 @@ size:{
 height:25,
 width:25
 },
-styleClass:"fa fa-close pull-right btn-close text-tertiary clickable",
+styleClass:"pull-right btn-close text-tertiary clickable",
 styleclass:"fa fa-close pull-right btn-close text-tertiary clickable"
 },
 location:"1,1",
 name:"faClose",
 size:"25,25",
-styleClass:"fa fa-close pull-right btn-close text-tertiary clickable",
+styleClass:"pull-right btn-close text-tertiary clickable",
 typeName:"bootstrapcomponents-label",
 typeid:47,
 uuid:"5435252C-E264-4309-B7D0-A703033C7FAE"

diff --git a/svyPopupFilter/forms/svyNumberPopupFilter.frm b/svyPopupFilter/forms/svyNumberPopupFilter.frm
@@ -64,6 +64,7 @@ items:[
 {
 json:{
 faclass:"fa fa-close",
+imageStyleClass:"fa fa-close",
 location:{
 x:1,
 y:1
@@ -73,13 +74,13 @@ size:{
 height:25,
 width:25
 },
-styleClass:"fa fa-close pull-right btn-close text-tertiary clickable",
+styleClass:"pull-right btn-close text-tertiary clickable",
 styleclass:"fa fa-close pull-right btn-close text-tertiary clickable"
 },
 location:"1,1",
 name:"faClose",
 size:"25,25",
-styleClass:"fa fa-close pull-right btn-close text-tertiary clickable",
+styleClass:"pull-right btn-close text-tertiary clickable",
 typeName:"bootstrapcomponents-label",
 typeid:47,
 uuid:"9FB676D0-7DA3-4635-AEC9-BADAD9F5BD56"

diff --git a/svyPopupFilter/forms/svyTokenPopupFilter.frm b/svyPopupFilter/forms/svyTokenPopupFilter.frm
@@ -45,6 +45,7 @@ items:[
 {
 json:{
 faclass:"fa fa-close",
+imageStyleClass:"fa fa-close",
 location:{
 x:2,
 y:2
@@ -59,7 +60,7 @@ styleclass:"pull-right btn-close text-tertiary clickable"
 location:"2,2",
 name:"faClose",
 size:"25,25",
-styleClass:"fa fa-close pull-right btn-close text-tertiary clickable",
+styleClass:"pull-right btn-close text-tertiary clickable",
 typeName:"bootstrapcomponents-label",
 typeid:47,
 uuid:"1916976D-2F8A-41FA-890C-48B91A3DAED0"