Merge remote-tracking branch 'origin/develop' into develop

kylehenning · kylehenning · commit ba61e37140df · 2025-05-13T16:54:08.000-07:00
diff --git a/RockWeb/Styles/_rock-core.less b/RockWeb/Styles/_rock-core.less
@@ -175,6 +175,7 @@
 
 // import as less files so they are concatenated properly
 @import (less) "./summernote/summernote.min.css";
+@import (less) "styles-v2-prototype/icons/tabler-icon.css";
 
 @import "_page-admin.less";
 @import "_modal.less";
diff --git a/RockWeb/Styles/styles-v2-prototype/icons/tabler-icon.css b/RockWeb/Styles/styles-v2-prototype/icons/tabler-icon.css
@@ -11,6 +11,7 @@
 .ti {
   font-family: "tabler-icons-outline" !important;
   font-weight: normal;
+  font-style: normal;
   font-size: 1.3em; /* Added this because FontAwesome Icon is bigger than tabler so, when switching to tabler from FA the tabler icon is smaller */
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`.ti {`
`12`	`12`	`font-family: "tabler-icons-outline" !important;`
`13`	`13`	`font-weight: normal;`
	`14`	`+ font-style: normal;`
`14`	`15`	`font-size: 1.3em; /* Added this because FontAwesome Icon is bigger than tabler so, when switching to tabler from FA the tabler icon is smaller */`
`15`	`16`	`}`
`16`	`17`