diff --git a/feature/calendar/src/main/java/ru/forbion/f7cloud/feature/calendar/CalendarComponents.kt b/feature/calendar/src/main/java/ru/forbion/f7cloud/feature/calendar/CalendarComponents.kt index dc4a3c0..ffd62f8 100644 --- a/feature/calendar/src/main/java/ru/forbion/f7cloud/feature/calendar/CalendarComponents.kt +++ b/feature/calendar/src/main/java/ru/forbion/f7cloud/feature/calendar/CalendarComponents.kt @@ -829,12 +829,14 @@ fun CalendarEventRow( @Composable private fun CalendarEventChip(event: CalendarEventItem, onClick: () -> Unit) { + // Живая тема: пилюля события — #ECF9DE с рамкой #70B62B, r4, текст 12/16 Text( event.summary, modifier = Modifier .fillMaxWidth() - .clip(RoundedCornerShape(6.dp)) - .background(F7Colors.Primary.copy(alpha = 0.15f)) + .clip(RoundedCornerShape(4.dp)) + .background(F7Colors.PrimaryLight) + .border(1.dp, F7Colors.Primary, RoundedCornerShape(4.dp)) .clickable(onClick = onClick) .padding(horizontal = 6.dp, vertical = 4.dp), style = MaterialTheme.typography.labelSmall, @@ -1093,7 +1095,13 @@ fun CalendarEventDetailSheet( .padding(bottom = 28.dp), verticalArrangement = Arrangement.spacedBy(12.dp), ) { - Text(event.summary, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold) + // Живая тема: заголовки модалок 18/600 + Text( + event.summary, + style = MaterialTheme.typography.titleMedium.copy(fontSize = 18.sp), + fontWeight = FontWeight.SemiBold, + color = F7Colors.TextPrimary, + ) CalendarDetailRow( iconUrl = "$base/themes/forbion/images/calendar/event-clock.svg", label = "Время",