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

V2 Basic Card: Modifier order revert #649

Merged
merged 3 commits into from
May 2, 2024
Merged

V2 Basic Card: Modifier order revert #649

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd5ac85
added one more modifier
May 2, 2024
d609e93
reverting modifier changes
May 2, 2024
b9cbad6
removing testing padding
May 2, 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
Prev Previous commit
Next Next commit
reverting modifier changes
  • Loading branch information
Anubhav Agrawal committed May 2, 2024
commit d609e938d06508ff5a46e75250e5843d13e5c851
5 changes: 0 additions & 5 deletions fluentui_controls/src/main/java/com/microsoft/fluentui/tokenized/controls/BasicCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ import com.microsoft.fluentui.theme.token.controlTokens.CardType
* @param modifier Modifier for the card which is applied first in order
* @param cardType defines the card type, whether Elevated or Outlined
* @param basicCardTokens Optional tokens for customizing the card
* @param sequentiallyLastModifier Modifier for the card which is applied sequentially after the default modifier
* @param content Content for the card
*/
@Composable
fun BasicCard(
modifier: Modifier = Modifier,
cardType: CardType = CardType.Elevated,
basicCardTokens: BasicCardTokens? = null,
sequentiallyLastModifier : Modifier? = null,
content: @Composable () -> Unit
) {
val themeID =
Expand All @@ -56,9 +54,6 @@ fun BasicCard(
)
.clip(shape)
.padding(horizontal = 16.dp)
.then(
sequentiallyLastModifier ?: Modifier
)
) {
content()
}
Expand Down