Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/gallery/font_icon' into gallery/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Sanlorng committed Sep 23, 2024
2 parents 5aacfc7 + 9a38aa1 commit f24c917
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ import com.konyaco.fluent.gallery.component.HeaderItemRow
import com.konyaco.fluent.gallery.component.ItemRow
import com.konyaco.fluent.source.generated.FluentSourceFile

@Component(index = 1, icon = "TextFont", iconGlyph = '\uE8D2')
@OptIn(ExperimentalTextApi::class)
@Component(index = 1, icon = "TextFont")
@Component(index = 1, icon = "TextFont", iconGlyph = '\uE8D2')
@Composable
fun TypographyScreen() {
val linkTextColor = FluentTheme.colors.text.accent.primary
Expand Down

0 comments on commit f24c917

Please sign in to comment.