Skip to content

Commit 3fa8b2d

Browse files
committed
[BOOK-474] feat: 구글 로그인 버튼 border 적용 및 변경된 색상 반영
회원가입 없이 둘러보기 텍스트 버튼 contentColor 변경 및 padding 변경사항 반영
1 parent 494a7db commit 3fa8b2d

File tree

3 files changed

+4
-3
lines changed
  • core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem
  • feature/login/src/main/kotlin/com/ninecraft/booket/feature/login

3 files changed

+4
-3
lines changed

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonColorStyle.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ enum class ReedButtonColorStyle {
2828
SECONDARY -> ReedTheme.colors.contentPrimary
2929
TERTIARY -> ReedTheme.colors.contentBrand
3030
STROKE -> ReedTheme.colors.contentBrand
31-
TEXT -> ReedTheme.colors.borderBrand
31+
TEXT -> ReedTheme.colors.contentTertiary
3232
KAKAO -> ReedTheme.colors.contentPrimary
3333
GOOGLE -> ReedTheme.colors.contentPrimary
3434
}
@@ -45,6 +45,7 @@ enum class ReedButtonColorStyle {
4545
@Composable
4646
fun borderStroke() = when (this) {
4747
STROKE -> BorderStroke(1.dp, ReedTheme.colors.borderBrand)
48+
GOOGLE -> BorderStroke(1.dp, ReedTheme.colors.borderPrimary)
4849
else -> null
4950
}
5051
}

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/theme/Color.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ val Blue700 = Color(0xFF007BFF)
6363
val Blue800 = Color(0xFF1269EC)
6464
val Blue900 = Color(0xFF1F47CD)
6565

66-
val Kakao = Color(0xFFFBD300)
66+
val Kakao = Color(0xFFFFEB00)
6767
val Google = Color(0xFF4285F4)
6868
val Blank = Color(0xFFD6D6D6)
6969
val HomeBg = Color(0xFFF0F9E8)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ internal fun LoginUi(
136136
}
137137
)
138138
Spacer(
139-
modifier = Modifier.height(if (state.returnToScreen == null) ReedTheme.spacing.spacing2 else ReedTheme.spacing.spacing8),
139+
modifier = Modifier.height(if (state.returnToScreen == null) ReedTheme.spacing.spacing3 else ReedTheme.spacing.spacing8),
140140
)
141141
if (state.returnToScreen == null) {
142142
ReedTextButton(

0 commit comments

Comments
 (0)