Skip to content

Commit c8e35ca

Browse files
authored
Merge branch 'main' into main
2 parents 055a552 + ac26f65 commit c8e35ca

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Sources/FioriSwiftUICore/_ComponentProtocols/BaseComponentProtocols.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ protocol _TopDividerComponent {
270270
// sourcery: BaseComponent
271271
protocol _CloseActionComponent {
272272
// sourcery: @ViewBuilder
273-
// sourcery: defaultValue = "FioriButton { _ in Image(systemName: "xmark") }"
274-
// sourcery: resultBuilder.defaultValue = "{ FioriButton { _ in Image(systemName: "xmark") } }"
273+
// sourcery: defaultValue = "FioriButton { _ in Image(fioriName: "fiori.decline") }"
274+
// sourcery: resultBuilder.defaultValue = "{ FioriButton { _ in Image(fioriName: "fiori.decline") } }"
275275
var closeAction: FioriButton? { get }
276276
}
277277

Sources/FioriSwiftUICore/_FioriStyles/WritingAssistantFormStyle.fiori.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,12 @@ struct AIWACloseButtonStyle: FioriButtonStyle {
115115
let isPressed = configuration.state == .highlighted || configuration.state == .selected
116116
let isDisabled = configuration.state == .disabled
117117
return configuration.label
118-
.font(Font.fiori(forTextStyle: .footnote, weight: .semibold))
118+
.font(.system(size: 8, weight: .bold))
119119
.foregroundColor(.preferredColor(isPressed || isDisabled ? .quaternaryLabel : .primaryLabel))
120+
.padding(8)
121+
.background {
122+
Circle().fill(Color.preferredColor(.tertiaryFill))
123+
}
120124
}
121125
}
122126

0 commit comments

Comments
 (0)