Merge pull request #6517 from element-hq/feature/bma/compound10
Sync compound tokens https://github.com/element-hq/compound-design-tokens/releases/tag/v10.0.0
This commit is contained in:
commit
e63a50b512
106 changed files with 209 additions and 201 deletions
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:37f6acca46890e98087ece62e2716fa60791479fab02999406050517e3b79307
|
||||
size 240187
|
||||
oid sha256:7901fea2f578c8ed796160c9c08f417c61f4fb21580f958844fdf0cb794adf8a
|
||||
size 239731
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a2de5e6d24dcbe0baa75a69485f5a308466fa599625bcbdb0cb96e9bc5a1b708
|
||||
size 253233
|
||||
oid sha256:245f012d419817f6557d92a71729b3b70092f24f0eba37f2f1fc431ad27592be
|
||||
size 252969
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ae1cb46d82acbb23cc172f41e20a41bbe88c350ab53c20e5b2a91f2c16590fbf
|
||||
size 254525
|
||||
oid sha256:2d15c52b21cc279d306fa187cd0c318820109b5ec66270e6447e1b02e800eeba
|
||||
size 254206
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8a8a9b6e61758a40d01028a4edb4a4d21b845b83b3e0793ed0934e48f3d9eea0
|
||||
size 94637
|
||||
oid sha256:85ef188fa3a27e42f4beafc899c1f3e7e8bcfad980ed76af6a03f76d70d6a511
|
||||
size 93807
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7f29d225df71587fefe07ec8739b84f1a0469786c6b1d6778da0bad33d19574e
|
||||
size 101183
|
||||
oid sha256:f6e38386e95dc0c50384f06fca122ce14851ceff8ffc7865e394c1b4fccc5db6
|
||||
size 100555
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -229,9 +229,6 @@ object CompoundIcons {
|
|||
@Composable fun Filter(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_filter)
|
||||
}
|
||||
@Composable fun Folder(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_folder)
|
||||
}
|
||||
@Composable fun Forward(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_forward)
|
||||
}
|
||||
|
|
@ -771,7 +768,6 @@ object CompoundIcons {
|
|||
FileError(),
|
||||
Files(),
|
||||
Filter(),
|
||||
Folder(),
|
||||
Forward(),
|
||||
FullScreen(),
|
||||
Grid(),
|
||||
|
|
@ -1000,7 +996,6 @@ object CompoundIcons {
|
|||
R.drawable.ic_compound_file_error,
|
||||
R.drawable.ic_compound_files,
|
||||
R.drawable.ic_compound_filter,
|
||||
R.drawable.ic_compound_folder,
|
||||
R.drawable.ic_compound_forward,
|
||||
R.drawable.ic_compound_full_screen,
|
||||
R.drawable.ic_compound_grid,
|
||||
|
|
|
|||
|
|
@ -91,6 +91,8 @@ data class SemanticColors(
|
|||
val bgSubtleSecondaryLevel0: Color,
|
||||
/** Subtle background colour for success state elements. State: Rest. */
|
||||
val bgSuccessSubtle: Color,
|
||||
/** Accent borders for containers */
|
||||
val borderAccentPrimary: Color,
|
||||
/** accent border intended for keylines on message highlights */
|
||||
val borderAccentSubtle: Color,
|
||||
/** High-contrast border for critical state. State: Hover. */
|
||||
|
|
@ -171,6 +173,8 @@ data class SemanticColors(
|
|||
val iconTertiary: Color,
|
||||
/** Translucent version of tertiary icon. Refer to it for intended use. */
|
||||
val iconTertiaryAlpha: Color,
|
||||
/** Used to separate core sections of the UI as well as containers */
|
||||
val separatorPrimary: Color,
|
||||
/** Accent text colour for plain actions. */
|
||||
val textActionAccent: Color,
|
||||
/** Default text colour for plain actions. */
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ val compoundColorsDark = SemanticColors(
|
|||
bgSubtleSecondary = DarkColorTokens.colorGray300,
|
||||
bgSubtleSecondaryLevel0 = DarkColorTokens.colorThemeBg,
|
||||
bgSuccessSubtle = DarkColorTokens.colorGreen200,
|
||||
borderAccentPrimary = DarkColorTokens.colorGreen900,
|
||||
borderAccentSubtle = DarkColorTokens.colorGreen700,
|
||||
borderCriticalHovered = DarkColorTokens.colorRed1000,
|
||||
borderCriticalPrimary = DarkColorTokens.colorRed900,
|
||||
|
|
@ -101,6 +102,7 @@ val compoundColorsDark = SemanticColors(
|
|||
iconSuccessPrimary = DarkColorTokens.colorGreen900,
|
||||
iconTertiary = DarkColorTokens.colorGray800,
|
||||
iconTertiaryAlpha = DarkColorTokens.colorAlphaGray800,
|
||||
separatorPrimary = DarkColorTokens.colorGray400,
|
||||
textActionAccent = DarkColorTokens.colorGreen900,
|
||||
textActionPrimary = DarkColorTokens.colorGray1400,
|
||||
textBadgeAccent = DarkColorTokens.colorGreen1100,
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ val compoundColorsHcDark = SemanticColors(
|
|||
bgSubtleSecondary = DarkHcColorTokens.colorGray300,
|
||||
bgSubtleSecondaryLevel0 = DarkHcColorTokens.colorThemeBg,
|
||||
bgSuccessSubtle = DarkHcColorTokens.colorGreen200,
|
||||
borderAccentPrimary = DarkHcColorTokens.colorGreen900,
|
||||
borderAccentSubtle = DarkHcColorTokens.colorGreen700,
|
||||
borderCriticalHovered = DarkHcColorTokens.colorRed1000,
|
||||
borderCriticalPrimary = DarkHcColorTokens.colorRed900,
|
||||
|
|
@ -101,6 +102,7 @@ val compoundColorsHcDark = SemanticColors(
|
|||
iconSuccessPrimary = DarkHcColorTokens.colorGreen900,
|
||||
iconTertiary = DarkHcColorTokens.colorGray800,
|
||||
iconTertiaryAlpha = DarkHcColorTokens.colorAlphaGray800,
|
||||
separatorPrimary = DarkHcColorTokens.colorGray400,
|
||||
textActionAccent = DarkHcColorTokens.colorGreen900,
|
||||
textActionPrimary = DarkHcColorTokens.colorGray1400,
|
||||
textBadgeAccent = DarkHcColorTokens.colorGreen1100,
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ val compoundColorsLight = SemanticColors(
|
|||
bgSubtleSecondary = LightColorTokens.colorGray300,
|
||||
bgSubtleSecondaryLevel0 = LightColorTokens.colorGray300,
|
||||
bgSuccessSubtle = LightColorTokens.colorGreen200,
|
||||
borderAccentPrimary = LightColorTokens.colorGreen900,
|
||||
borderAccentSubtle = LightColorTokens.colorGreen700,
|
||||
borderCriticalHovered = LightColorTokens.colorRed1000,
|
||||
borderCriticalPrimary = LightColorTokens.colorRed900,
|
||||
|
|
@ -101,6 +102,7 @@ val compoundColorsLight = SemanticColors(
|
|||
iconSuccessPrimary = LightColorTokens.colorGreen900,
|
||||
iconTertiary = LightColorTokens.colorGray800,
|
||||
iconTertiaryAlpha = LightColorTokens.colorAlphaGray800,
|
||||
separatorPrimary = LightColorTokens.colorGray400,
|
||||
textActionAccent = LightColorTokens.colorGreen900,
|
||||
textActionPrimary = LightColorTokens.colorGray1400,
|
||||
textBadgeAccent = LightColorTokens.colorGreen1100,
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ val compoundColorsHcLight = SemanticColors(
|
|||
bgSubtleSecondary = LightHcColorTokens.colorGray300,
|
||||
bgSubtleSecondaryLevel0 = LightHcColorTokens.colorGray300,
|
||||
bgSuccessSubtle = LightHcColorTokens.colorGreen200,
|
||||
borderAccentPrimary = LightHcColorTokens.colorGreen900,
|
||||
borderAccentSubtle = LightHcColorTokens.colorGreen700,
|
||||
borderCriticalHovered = LightHcColorTokens.colorRed1000,
|
||||
borderCriticalPrimary = LightHcColorTokens.colorRed900,
|
||||
|
|
@ -101,6 +102,7 @@ val compoundColorsHcLight = SemanticColors(
|
|||
iconSuccessPrimary = LightHcColorTokens.colorGreen900,
|
||||
iconTertiary = LightHcColorTokens.colorGray800,
|
||||
iconTertiaryAlpha = LightHcColorTokens.colorAlphaGray800,
|
||||
separatorPrimary = LightHcColorTokens.colorGray400,
|
||||
textActionAccent = LightHcColorTokens.colorGreen900,
|
||||
textActionPrimary = LightHcColorTokens.colorGray1400,
|
||||
textBadgeAccent = LightHcColorTokens.colorGreen1100,
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ private fun ReplyToModeView(
|
|||
modifier
|
||||
.clip(RoundedCornerShape(6.dp))
|
||||
.background(ElementTheme.colors.bgCanvasDefault)
|
||||
.border(1.dp, ElementTheme.colors.borderInteractiveSecondary, RoundedCornerShape(6.dp))
|
||||
.border(1.dp, ElementTheme.colors.separatorPrimary, RoundedCornerShape(6.dp))
|
||||
.padding(4.dp)
|
||||
) {
|
||||
InReplyToView(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue