Merge pull request #446 from bethinkpl/IT-5861_fix_border_color_for_R…

…LI_group IT-5861 fix border colors
bethinkpl · Nov 27, 2024 · bc8dc3f · bc8dc3f
2 parents 0f6f060 + aa67277
commit bc8dc3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/js/components/RichList/GroupRichListItem/GroupRichListItem.vue b/lib/js/components/RichList/GroupRichListItem/GroupRichListItem.vue
@@ -136,13 +136,13 @@ export default defineComponent({
 			};
 		},
 		borderColorClass() {
-			if (!this.borderColor || (this.borderColor && this.borderColorHex)) {
+			if (!this.borderColor || this.borderColorHex) {
 				return;
 			}
 			return `-ds-border-${this.borderColor}`;
 		},
 		borderColorStyle() {
-			if (!this.borderColor || !this.borderColorHex) {
+			if (!this.borderColorHex) {
 				return;
 			}
 			return {

diff --git a/lib/js/components/RichList/RichListItem/RichListItem.vue b/lib/js/components/RichList/RichListItem/RichListItem.vue
@@ -670,13 +670,13 @@ export default defineComponent({
 			};
 		},
 		borderColorClass() {
-			if (!this.borderColor || (this.borderColor && this.borderColorHex)) {
+			if (!this.borderColor || this.borderColorHex) {
 				return;
 			}
 			return `-ds-border-${this.borderColor}`;
 		},
 		borderColorStyle() {
-			if (!this.borderColor && !this.borderColorHex) {
+			if (!this.borderColorHex) {
 				return;
 			}
 			return {