Skip to content

Commit d5c2617

Browse files
committed
ux: change all basic styles with drop-shadow effect
1 parent 24635ed commit d5c2617

File tree

1 file changed

+12
-30
lines changed

1 file changed

+12
-30
lines changed

src/Resources/Styles.axaml

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,8 @@
198198
<Setter Property="TextBlock.TextDecorations" Value=""/>
199199
<Setter Property="Template">
200200
<ControlTemplate>
201-
<Grid Effect="drop-shadow(0 0 8 #30000000)">
202-
<Border Margin="8"
203-
Padding="8,6"
201+
<Grid Margin="8" Effect="drop-shadow(0 0 8 #30000000)">
202+
<Border Padding="8,6"
204203
CornerRadius="4"
205204
Background="{DynamicResource Brush.Popup}"
206205
BorderBrush="{DynamicResource Brush.Border2}"
@@ -227,7 +226,7 @@
227226

228227
<Setter Property="Template">
229228
<ControlTemplate>
230-
<Border Margin="4" CornerRadius="{TemplateBinding CornerRadius}" Effect="drop-shadow(0 0 4 #A0000000)">
229+
<Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)">
231230
<Border Name="LayoutRoot"
232231
Padding="12"
233232
Background="{DynamicResource Brush.Popup}"
@@ -245,7 +244,7 @@
245244
VerticalContentAlignment="Stretch" />
246245
</ScrollViewer>
247246
</Border>
248-
</Border>
247+
</Grid>
249248
</ControlTemplate>
250249
</Setter>
251250
</Style>
@@ -814,15 +813,11 @@
814813
<Setter Property="VerticalOffset" Value="-4"/>
815814
<Setter Property="Template">
816815
<ControlTemplate>
817-
<Grid>
818-
<Border Background="{DynamicResource Brush.Popup}" BorderThickness="0" Margin="4" CornerRadius="{TemplateBinding CornerRadius}">
819-
<Border.Effect>
820-
<DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6"/>
821-
</Border.Effect>
822-
</Border>
823-
816+
<Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)">
824817
<Border BorderThickness="0"
825-
Margin="8,4"
818+
Background="{DynamicResource Brush.Popup}"
819+
CornerRadius="{TemplateBinding CornerRadius}"
820+
Padding="8,4"
826821
MaxWidth="{TemplateBinding MaxWidth}"
827822
MinHeight="{TemplateBinding MinHeight}"
828823
HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
@@ -842,16 +837,9 @@
842837
<Style Selector="MenuFlyoutPresenter">
843838
<Setter Property="Template">
844839
<ControlTemplate>
845-
<Grid>
846-
<Border Background="{DynamicResource Brush.Popup}" BorderThickness="0" Margin="4" CornerRadius="{TemplateBinding CornerRadius}">
847-
<Border.Effect>
848-
<DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6"/>
849-
</Border.Effect>
850-
</Border>
851-
840+
<Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)">
852841
<Border Name="LayoutRoot"
853-
Margin="4"
854-
Background="Transparent"
842+
Background="{DynamicResource Brush.Popup}"
855843
BorderBrush="{TemplateBinding BorderBrush}"
856844
BorderThickness="0"
857845
Padding="4,2"
@@ -962,14 +950,8 @@
962950
HorizontalOffset="-4"
963951
VerticalOffset="-4"
964952
IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
965-
<Grid>
966-
<Border Background="{DynamicResource Brush.Popup}" Margin="4" CornerRadius="{DynamicResource OverlayCornerRadius}">
967-
<Border.Effect>
968-
<DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6"/>
969-
</Border.Effect>
970-
</Border>
971-
972-
<Border BorderThickness="0" Margin="8,4" MaxHeight="400">
953+
<Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)">
954+
<Border BorderThickness="0" Padding="8,4" MaxHeight="400" Background="{DynamicResource Brush.Popup}" CornerRadius="{DynamicResource OverlayCornerRadius}">
973955
<ScrollViewer>
974956
<ItemsPresenter Name="PART_ItemsPresenter"
975957
Margin="{DynamicResource MenuFlyoutScrollerMargin}"

0 commit comments

Comments
 (0)