Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX/#279] 홈 뷰 최종 QA 반영 #284

Merged
merged 2 commits into from
Oct 7, 2024
+7 −9
Merged

[FIX/#279] 홈 뷰 최종 QA 반영 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9981443
[FIX/#279] 곧 마감 공고 카드 그림자 연하게 수정
Hyobeen-Park Oct 6, 2024
0730c1b
Merge remote-tracking branch 'refs/remotes/origin/develop' into fix/#…
Hyobeen-Park Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions feature/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.terning.core.designsystem.component.image.TerningImage
import com.terning.core.designsystem.theme.Grey200
import com.terning.core.designsystem.theme.Grey150
import com.terning.core.designsystem.theme.Grey500
import com.terning.core.designsystem.theme.TerningTheme
import com.terning.core.designsystem.theme.White
Expand All @@ -31,9 +31,9 @@ fun HomeUpcomingEmptyFilter(
.fillMaxWidth()
.padding(horizontal = 24.dp)
.customShadow(
color = Grey200,
color = Grey150,
shadowRadius = 5.dp,
shadowWidth = 2.dp
shadowWidth = 1.dp
)
.background(
color = White,
Expand Down
7 changes: 3 additions & 4 deletions feature/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyIntern.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.terning.core.designsystem.theme.Grey200
import com.terning.core.designsystem.theme.Grey400
import com.terning.core.designsystem.theme.Grey150
import com.terning.core.designsystem.theme.Grey500
import com.terning.core.designsystem.theme.TerningMain
import com.terning.core.designsystem.theme.TerningTheme
Expand All @@ -35,9 +34,9 @@ fun HomeUpcomingEmptyIntern(
.fillMaxWidth()
.padding(horizontal = 24.dp)
.customShadow(
color = Grey200,
color = Grey150,
shadowRadius = 5.dp,
shadowWidth = 2.dp
shadowWidth = 1.dp
)
.background(
color = White,
Expand Down
3 changes: 1 addition & 2 deletions feature/src/main/java/com/terning/feature/home/component/HomeUpcomingInternScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import coil.request.ImageRequest
import com.terning.core.designsystem.component.item.ScrapBox
import com.terning.core.designsystem.theme.Black
import com.terning.core.designsystem.theme.Grey150
import com.terning.core.designsystem.theme.Grey200
import com.terning.core.designsystem.theme.Grey500
import com.terning.core.designsystem.theme.TerningMain
import com.terning.core.designsystem.theme.TerningSub3
Expand Down Expand Up @@ -72,7 +71,7 @@ fun HomeUpcomingInternScreen(
modifier = Modifier
.width(246.dp)
.customShadow(
color = Grey200,
color = Grey150,
shadowRadius = 5.dp,
shadowWidth = 1.dp
),
Expand Down
Loading