File tree 6 files changed +28
-9
lines changed
DesignSystem/src/main/res/values
compose/src/main/java/com/yourssu/design/system/compose/foundation
6 files changed +28
-9
lines changed Original file line number Diff line number Diff line change 15
15
<drawable name =" logoViolet" >#8969AC</drawable >
16
16
<drawable name =" logoBlue" >#1653DB</drawable >
17
17
<drawable name =" logoYellow" >#FDD655</drawable >
18
+ <drawable name =" logoLightBlue" >#5865F2</drawable >
19
+ <drawable name =" logoDarkBlue" >#423FCC</drawable >
18
20
19
21
<!-- pointColor -->
20
22
<drawable name =" pointColor050" >#EBE6FB</drawable >
Original file line number Diff line number Diff line change 45
45
<dimen name =" subtitle2_line_height" >20.8dp</dimen >
46
46
47
47
<style name =" Text.SubTitle3" >
48
- <item name =" android:textSize" >14dp </item >
48
+ <item name =" android:textSize" >18dp </item >
49
49
<item name =" android:fontFamily" >@font/spoqa_han_sans_neo_medium</item >
50
50
</style >
51
- <dimen name =" subtitle3_line_height" >18.2dp </dimen >
51
+ <dimen name =" subtitle3_line_height" >23.4dp </dimen >
52
52
53
53
<style name =" Text.Body1" >
54
54
<item name =" android:textSize" >15dp</item >
62
62
</style >
63
63
<dimen name =" body2_line_height" >21dp</dimen >
64
64
65
+ <style name =" Text.Body16" >
66
+ <item name =" android:textSize" >16dp</item >
67
+ <item name =" android:fontFamily" >@font/spoqa_han_sans_neo_regular</item >
68
+ </style >
69
+ <dimen name =" body16_line_height" >20.8dp</dimen >
70
+
65
71
<style name =" Text.Button0" >
66
72
<item name =" android:textSize" >16dp</item >
67
73
<item name =" android:fontFamily" >@font/spoqa_han_sans_neo_medium</item >
Original file line number Diff line number Diff line change @@ -120,7 +120,11 @@ data class YdsColorScheme(
120
120
// PinkItem
121
121
val pinkItemPrimary : Color = Pink300 ,
122
122
val pinkItemBG : Color = Pink050 ,
123
- val pinkItemText : Color = Pink600
123
+ val pinkItemText : Color = Pink600 ,
124
+
125
+ // Logo
126
+ val logoLightBlue : Color = LogoLightBlue ,
127
+ val logoDarkBlue : Color = LogoDarkBlue ,
124
128
)
125
129
126
130
val lightColorScheme = YdsColorScheme ()
@@ -187,7 +191,7 @@ val darkColorScheme = YdsColorScheme(
187
191
tooltipPoint = PointColor400_night ,
188
192
189
193
// Pressed
190
- pressed = White000A10
194
+ pressed = White000A10 ,
191
195
192
196
// Shadow * 다크모드에서는 Shadow를 사용하지 않습니다 *
193
197
Original file line number Diff line number Diff line change @@ -96,8 +96,8 @@ data class YdsTypography(
96
96
),
97
97
val subTitle3 : YdsTextStyle = YdsTextStyle (
98
98
fontWeight = FontWeight .Medium ,
99
- fontSize = 14 .dp,
100
- lineHeight = 18.2f .dp,
99
+ fontSize = 18 .dp,
100
+ lineHeight = 23.4f .dp,
101
101
),
102
102
val body1 : YdsTextStyle = YdsTextStyle (
103
103
fontWeight = FontWeight .Normal ,
@@ -109,6 +109,11 @@ data class YdsTypography(
109
109
fontSize = 14.dp,
110
110
lineHeight = 21f.dp,
111
111
),
112
+ val body16 : YdsTextStyle = YdsTextStyle (
113
+ fontWeight = FontWeight .Normal ,
114
+ fontSize = 16.dp,
115
+ lineHeight = 20.8f.dp,
116
+ ),
112
117
val button0 : YdsTextStyle = YdsTextStyle (
113
118
fontWeight = FontWeight .Medium ,
114
119
fontSize = 16.dp,
@@ -125,7 +130,7 @@ data class YdsTypography(
125
130
lineHeight = 18.2f.dp,
126
131
),
127
132
val button3 : YdsTextStyle = YdsTextStyle (
128
- fontWeight = FontWeight .Medium ,
133
+ fontWeight = FontWeight .Normal ,
129
134
fontSize = 14.dp,
130
135
lineHeight = 18.2f.dp,
131
136
),
@@ -140,7 +145,7 @@ data class YdsTypography(
140
145
lineHeight = 15.6f.dp,
141
146
),
142
147
val caption1 : YdsTextStyle = YdsTextStyle (
143
- fontWeight = FontWeight .Medium ,
148
+ fontWeight = FontWeight .Normal ,
144
149
fontSize = 12.dp,
145
150
lineHeight = 15.6f.dp,
146
151
),
Original file line number Diff line number Diff line change @@ -7,6 +7,8 @@ internal val LogoIndigo = Color(0xFF4E5986)
7
7
internal val LogoViolet = Color (0xFF8969AC )
8
8
internal val LogoBlue = Color (0xFF1653DB )
9
9
internal val LogoYellow = Color (0xFFFDD655 )
10
+ internal val LogoLightBlue = Color (0xFF5865F2 )
11
+ internal val LogoDarkBlue = Color (0xFF423FCC )
10
12
11
13
// pointColor
12
14
internal val PointColor050 = Color (0xFFEBE6FB )
Original file line number Diff line number Diff line change 1
- versionName =2.5.8
1
+ versionName =2.5.9
2
2
# 자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다
You can’t perform that action at this time.
0 commit comments