Skip to content

Commit 1ff62c4

Browse files
authored
Merge pull request #278 from YAPP-Github/BOOK-513-fix/#271
fix: 로그인 툴팁 패딩, 텍스트 사이즈 수정
2 parents 44fabb9 + 00dd582 commit 1ff62c4

2 files changed

Lines changed: 32 additions & 4 deletions

File tree

feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,3 +210,31 @@ private fun LoginPreview() {
210210
)
211211
}
212212
}
213+
214+
@DevicePreview
215+
@Composable
216+
private fun LoginKakaoTooltipPreview() {
217+
ReedTheme {
218+
LoginUi(
219+
state = LoginUiState(
220+
showLoginTooltip = true,
221+
recentLoginMethod = LoginMethod.KAKAO,
222+
eventSink = {},
223+
),
224+
)
225+
}
226+
}
227+
228+
@DevicePreview
229+
@Composable
230+
private fun LoginGoogleTooltipPreview() {
231+
ReedTheme {
232+
LoginUi(
233+
state = LoginUiState(
234+
showLoginTooltip = true,
235+
recentLoginMethod = LoginMethod.GOOGLE,
236+
eventSink = {},
237+
),
238+
)
239+
}
240+
}

feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/component/LoginTooltipBox.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ internal fun LoginTooltipBox(
6060
.clip(RoundedCornerShape(ReedTheme.radius.xs))
6161
.background(ReedTheme.colors.contentBrand)
6262
.padding(
63-
horizontal = ReedTheme.spacing.spacing3,
64-
vertical = ReedTheme.spacing.spacing2,
63+
horizontal = ReedTheme.spacing.spacing2,
64+
vertical = ReedTheme.spacing.spacing15,
6565
),
6666
) {
6767
Text(
6868
text = stringResource(messageResId),
6969
color = ReedTheme.colors.contentInverse,
70-
style = ReedTheme.typography.label2Regular,
70+
style = ReedTheme.typography.caption1Medium,
7171
)
7272
}
7373
Box(
@@ -76,7 +76,7 @@ internal fun LoginTooltipBox(
7676
.height(ReedTheme.spacing.spacing3 / 2)
7777
.offset {
7878
IntOffset(
79-
x = 14.dp.roundToPx(),
79+
x = 8.dp.roundToPx(),
8080
y = 0,
8181
)
8282
}

0 commit comments

Comments
 (0)