Skip to content

Commit f24c917

Browse files
committed
Merge remote-tracking branch 'origin/gallery/font_icon' into gallery/font_icon
# Conflicts: # gallery/src/commonMain/kotlin/com/konyaco/fluent/gallery/component/ComponentGroupInfo.kt # gallery/src/commonMain/kotlin/com/konyaco/fluent/gallery/screen/design/TypographyScreen.kt
2 parents 5aacfc7 + 9a38aa1 commit f24c917

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

gallery/src/commonMain/kotlin/com/konyaco/fluent/gallery/screen/design/TypographyScreen.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ import com.konyaco.fluent.gallery.component.HeaderItemRow
3030
import com.konyaco.fluent.gallery.component.ItemRow
3131
import com.konyaco.fluent.source.generated.FluentSourceFile
3232

33-
@Component(index = 1, icon = "TextFont", iconGlyph = '\uE8D2')
3433
@OptIn(ExperimentalTextApi::class)
35-
@Component(index = 1, icon = "TextFont")
34+
@Component(index = 1, icon = "TextFont", iconGlyph = '\uE8D2')
3635
@Composable
3736
fun TypographyScreen() {
3837
val linkTextColor = FluentTheme.colors.text.accent.primary

0 commit comments

Comments
 (0)