Merge pull request #1267 from unoplatform/dev/mazi/shadow-colors
fix: Shadow colors are no longer solid black
This commit is contained in:
Коммит
97b9d50566
|
@ -52,7 +52,7 @@
|
|||
<Color x:Key="SeparatorColor">#493c3c43</Color>
|
||||
<Color x:Key="OpaqueSeparatorColor">#c6c6c8</Color>
|
||||
<Color x:Key="LinkColor">#007aff</Color>
|
||||
<Color x:Key="ShadowColor">#CC3c3c43</Color>
|
||||
<Color x:Key="ShadowColor">#33000000</Color>
|
||||
<Color x:Key="RadioButtonBackgroundColor">#FFFFFF</Color>
|
||||
</ResourceDictionary>
|
||||
|
||||
|
@ -98,7 +98,7 @@
|
|||
<Color x:Key="SeparatorColor">#99545458</Color>
|
||||
<Color x:Key="OpaqueSeparatorColor">#38383a</Color>
|
||||
<Color x:Key="LinkColor">#0984ff</Color>
|
||||
<Color x:Key="ShadowColor">#CC3c3c43</Color>
|
||||
<Color x:Key="ShadowColor">#33000000</Color>
|
||||
<Color x:Key="RadioButtonBackgroundColor">#8E8E93</Color>
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary.ThemeDictionaries>
|
||||
|
|
|
@ -106,7 +106,7 @@
|
|||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="{TemplateBinding CornerRadius}"
|
||||
Elevation="{StaticResource MaterialDatePickerFlyoutElevation}"
|
||||
ShadowColor="Black">
|
||||
ShadowColor="{StaticResource ShadowColor}">
|
||||
<Border x:Name="Background">
|
||||
<Grid x:Name="ContentPanel">
|
||||
|
||||
|
|
|
@ -50,6 +50,8 @@
|
|||
<SolidColorBrush x:Key="MaterialBottomNavUncheckedForegroundBrush"
|
||||
Color="{ThemeResource MaterialOnPrimaryColor}"
|
||||
Opacity="0.60" />
|
||||
|
||||
<Color x:Key="MaterialShadowColor">#33000000</Color>
|
||||
</ResourceDictionary>
|
||||
|
||||
<!-- Dark Theme -->
|
||||
|
@ -90,6 +92,8 @@
|
|||
<SolidColorBrush x:Key="MaterialBottomNavUncheckedForegroundBrush"
|
||||
Color="{StaticResource MaterialOnSurfaceColor}"
|
||||
Opacity="0.60" />
|
||||
|
||||
<Color x:Key="MaterialShadowColor">#33000000</Color>
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary.ThemeDictionaries>
|
||||
|
||||
|
|
|
@ -61,6 +61,9 @@
|
|||
<!-- Outline -->
|
||||
<Color x:Key="OutlineColor">#79747E</Color>
|
||||
<Color x:Key="OutlineVariantColor">#C9C5D0</Color>
|
||||
|
||||
<!-- Shadow -->
|
||||
<Color x:Key="ShadowColor">#33000000</Color>
|
||||
</ResourceDictionary>
|
||||
|
||||
<!-- Dark Theme -->
|
||||
|
@ -113,7 +116,10 @@
|
|||
|
||||
<!-- Outline -->
|
||||
<Color x:Key="OutlineColor">#928F99</Color>
|
||||
<Color x:Key="OutlineVariantColor">#57545D</Color>
|
||||
<Color x:Key="OutlineVariantColor">#57545D</Color>
|
||||
|
||||
<!-- Shadow -->
|
||||
<Color x:Key="ShadowColor">#33000000</Color>
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary.ThemeDictionaries>
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@
|
|||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="{TemplateBinding CornerRadius}"
|
||||
Elevation="{StaticResource MaterialDatePickerFlyoutElevation}"
|
||||
ShadowColor="Black">
|
||||
ShadowColor="{StaticResource MaterialShadowColor}">
|
||||
<Border x:Name="Background">
|
||||
<Grid x:Name="ContentPanel">
|
||||
|
||||
|
|
|
@ -379,7 +379,7 @@
|
|||
Height="20"
|
||||
Elevation="4"
|
||||
CornerRadius="10"
|
||||
ShadowColor="Black"
|
||||
ShadowColor="{StaticResource MaterialShadowColor}"
|
||||
Background="Transparent"
|
||||
VerticalAlignment="Stretch"
|
||||
HorizontalAlignment="Stretch">
|
||||
|
|
|
@ -190,7 +190,7 @@
|
|||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="{TemplateBinding CornerRadius}"
|
||||
Elevation="{ThemeResource DatePickerFlyoutElevation}"
|
||||
ShadowColor="Black">
|
||||
ShadowColor="{StaticResource ShadowColor}">
|
||||
<Border x:Name="Background">
|
||||
<Grid x:Name="ContentPanel">
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче