Skip to content

Commit e4d499e

Browse files
authored
Merge pull request #126 from YAPP-Github/refactor/#125-redesign_emotion
[Refactor/#125] 감정구슬 리디자인 적용
2 parents cec77b0 + d69bd15 commit e4d499e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1254
-250
lines changed

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/typography/Type.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ class BitnagilTypography internal constructor(
101101
lineHeight = 30,
102102
letterSpacing = (-0.5f),
103103
),
104+
private val _cafe24SsurroundAir2: BitnagilTextStyle = BitnagilTextStyle(
105+
fontFamily = cafe24SsurroundAir,
106+
fontWeight = FontWeight.Light,
107+
fontSize = 16,
108+
lineHeight = 24,
109+
letterSpacing = (-0.5f),
110+
),
104111
) {
105112
private val _headline1Bold = _headline1.copy(fontWeight = FontWeight.Bold)
106113
private val _headline1Medium = _headline1.copy(fontWeight = FontWeight.Medium)
@@ -163,6 +170,7 @@ class BitnagilTypography internal constructor(
163170
val button1: TextStyle @Composable get() = _button1.toDpTextStyle
164171
val button2: TextStyle @Composable get() = _button2.toDpTextStyle
165172
val cafe24SsurroundAir: TextStyle @Composable get() = _cafe24SsurroundAir.toDpTextStyle
173+
val cafe24SsurroundAir2: TextStyle @Composable get() = _cafe24SsurroundAir2.toDpTextStyle
166174
}
167175

168176
internal val LocalBitnagilTypography = staticCompositionLocalOf { BitnagilTypography() }
5.87 KB
Loading
8.99 KB
Loading
1.47 KB
Loading
1.48 KB
Loading
4.58 KB
Loading
1.84 KB
Loading
3.59 KB
Loading
5.77 KB
Loading
909 Bytes
Loading

0 commit comments

Comments
 (0)