From a34c6f194d35df0aba11864775e170584d9645a9 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Mon, 6 Jun 2022 03:21:17 +0200 Subject: [PATCH] Adjusted headers colors --- src/main/kotlin/app/ui/Blame.kt | 9 +++++---- src/main/kotlin/app/ui/Diff.kt | 2 +- src/main/kotlin/app/ui/FileHistory.kt | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/app/ui/Blame.kt b/src/main/kotlin/app/ui/Blame.kt index 7a92187..4edcd0d 100644 --- a/src/main/kotlin/app/ui/Blame.kt +++ b/src/main/kotlin/app/ui/Blame.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.unit.sp import app.extensions.handMouseClickable import app.extensions.lineAt import app.extensions.toStringWithSpaces +import app.theme.headerBackground import app.theme.primaryTextColor import app.ui.components.PrimaryButton import app.ui.components.ScrollableLazyColumn @@ -130,7 +131,7 @@ fun MinimizedBlame( Row( modifier = Modifier .fillMaxWidth() - .height(50.dp) + .height(52.dp) .background(MaterialTheme.colors.surface), verticalAlignment = Alignment.CenterVertically, ) { @@ -181,9 +182,9 @@ private fun Header( Row( modifier = Modifier .fillMaxWidth() - .height(50.dp) - .padding(start = 8.dp, end = 8.dp, top = 8.dp) - .background(MaterialTheme.colors.surface), + .height(40.dp) + .padding(start = 8.dp, end = 8.dp) + .background(MaterialTheme.colors.headerBackground), verticalAlignment = Alignment.CenterVertically, ) { Text( diff --git a/src/main/kotlin/app/ui/Diff.kt b/src/main/kotlin/app/ui/Diff.kt index dae860d..9b08e27 100644 --- a/src/main/kotlin/app/ui/Diff.kt +++ b/src/main/kotlin/app/ui/Diff.kt @@ -304,7 +304,7 @@ fun DiffHeader( Row( modifier = Modifier .fillMaxWidth() - .height(50.dp) + .height(40.dp) .background(MaterialTheme.colors.headerBackground) .padding(start = 8.dp, end = 8.dp), verticalAlignment = Alignment.CenterVertically, diff --git a/src/main/kotlin/app/ui/FileHistory.kt b/src/main/kotlin/app/ui/FileHistory.kt index 8274813..eb0bdcc 100644 --- a/src/main/kotlin/app/ui/FileHistory.kt +++ b/src/main/kotlin/app/ui/FileHistory.kt @@ -27,6 +27,7 @@ import app.extensions.handMouseClickable import app.extensions.toSmartSystemString import app.extensions.toSystemDateTimeString import app.git.diff.DiffResult +import app.theme.headerBackground import app.theme.primaryTextColor import app.theme.secondaryTextColor import app.ui.components.AvatarImage @@ -67,9 +68,9 @@ private fun Header( Row( modifier = Modifier .fillMaxWidth() - .height(50.dp) - .padding(start = 8.dp, end = 8.dp, top = 8.dp) - .background(MaterialTheme.colors.surface), + .height(40.dp) + .padding(start = 8.dp, end = 8.dp) + .background(MaterialTheme.colors.headerBackground), verticalAlignment = Alignment.CenterVertically, ) { Text(